Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master

Bug: 111615259
Change-Id: I1c03925efdfc26590ebd2e4999bd2f25053a2c40
tree: 693ecb1041d55b6eb8baa4225647331282468007
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg