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

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