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

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