Merge pi-dr1-dev to aosp-master

Change-Id: I6921471abee7428a7fca2fef0163510a82fe01a5
tree: 276700c41e6024497f1edb881fa936f39860b5e4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml