am bb3b27ac: resolved conflicts for merge of 9929fd66 to lmp-dev-plus-aosp
am bb3b27ac: resolved conflicts for merge of 9929fd66 to lmp-dev-plus-aosp

* commit 'bb3b27ac341efbfabd572e720a095c2fde0fdd1f':
  Allow LOCAL_ASSET_DIR point to nonexistent dir

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build