DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I13065b101b061902f2c12648121a4fce276d7c68
tree: 03b423d10df8a6a98cfa3b36e7bf454e1d372946
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags