Merge pi-dr1-dev to aosp-master

Change-Id: Iacd5e80007ffbc22cc50a3fdd2ab2f04826f6907
tree: 79813b6a37595debeeb0ab3110fdf93cb9c5cdde
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml