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

Bug: 120848293
Change-Id: I425513c10d4b8fdbafe54308500ebfabe20cf672
tree: 25dd1f9bec27d33b363897ad798879120ebd6c4c
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/