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

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