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

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