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

Change-Id: I75f53d1c5473a4bcf2e4ced24cbb6cc65b26cfc2
tree: 18f879da9be2257042f7980cf03f4aafb0567445
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml