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

Change-Id: I114cd02f834d95b0cc969593d753af7fd3ff1d13
tree: f14ee81ce6e7b9daa57c0e4dac94bb13b064f517
  1. libs/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg