am ecc42675: Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"

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