[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: bf5d23fe77  -s ours am: 0d4abf1fc6  -s ours
am: 8c77e2a409  -s ours

Change-Id: I62972c771f751bea7874c486106a4e3718b55bce
tree: 63e90e0ae9bd894047a01b582e5c807ca2c1795d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags