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

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