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

Bug: 120848293
Change-Id: I57cfd82452292e6c3ba8b1d0aefb43648358c188
tree: a07ce05d8050b748cc6a5e94553073c17751968a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg