[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: aa20e8cc0f  -s ours

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