Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 85de664666

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