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

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