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

Bug: 120848293
Change-Id: I7ad40f870bc3a6b93fa8025142288ece61d81c15
tree: a6fe8ad0c18e7662810acea8b5388cf67294f5bb
  1. Android.mk
  2. AndroidManifest.xml
  3. OWNERS
  4. PREUPLOAD.cfg
  5. libs/
  6. res/
  7. src/