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

Change-Id: I9f4c0f2200c40621ede989e163a1120f99dfc2d4
tree: 214217ac1095ba1eafbcdb6b0d4e7ef72f10d3dd
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. PREUPLOAD.cfg