Snap for 4620899 from 72ebbaa60875b0f95bab23ac2cd2f964f20b89bd to pi-release

Change-Id: If6506c1ae4c94d894ecbcfee7c7bf2f35c9004f5
tree: 370072986bf76f0d9cb75c973b87f251d8fe2644
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml