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

Bug: 120848293
Change-Id: I0bbf5699028390f30e0c6430e827b5a679a8b29e
tree: 5f3370f0942c1241898acbc96496d30cc506d60c
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. assets/
  5. res/
  6. src/