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

Bug: 120848293
Change-Id: I6884dec9ec91dc358c1f96186b73599a21fcf743
tree: e17094b6fda7f5aefb3a2b1446f90d0983226b04
  1. Android.bp
  2. AndroidManifest.xml
  3. CleanSpec.mk
  4. OWNERS
  5. proguard.flags
  6. src/