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

Bug: 120848293
Change-Id: Ib8e734cef5caf8160a0c7c5b8a67c7e62bee3de0
tree: 69f0adbb8a3e0d2b8bf77ccd4d87f8d76ed5bdac
  1. Android.mk
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/