Merge a9aeacfbb49f430cd732b5b9aef370d89ad96f50 on remote branch

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