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

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