Merge pi-dr1-dev to aosp-master am: 9ffea959c0 am: 8f7ff36932
am: c76fbf8441

Change-Id: Iae11131b0aa8696a2bfb8323055be2be79a69a85
tree: e8a9e6b4b56f4bf44e96a3c8f5fd618ec9b9a140
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle