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

Bug: 120848293
Change-Id: I667e650850e42d1209cd76ec2da48e8e4c2becc1
tree: 40e3a51fe97e0f8750d33ac3050713269c5252cc
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/