Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: bb0de837ae

Change-Id: I8aaabea81dced520d95be595d056c1b6c8264ad0
tree: 65651a2acb995c62a816fd8740e1b279700dc67a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. PREUPLOAD.cfg