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

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