Merge e8c14ffd5f8fab8067638ad59eb301de19ae2c51 on remote branch

Change-Id: Ic333ee2f21e69b67bd249ffcdeb966b49990e7dc
tree: 2357a0901a10a4258ebb9e1bd017995e1d61eabb
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml