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

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