Merge pi-dr1-dev to aosp-master
am: 63976185f7

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