Merge e923d015fc2df40231202e1d2885c4b9c885ec67 on remote branch

Change-Id: I8ebb6cf06f5fbb4936e03ed209ee6d1736f17301
tree: dead0ce43131376ccbcb371fe51526a3a1a36be5
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml