[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: e0fa47edc1  -s ours

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