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

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