Merge pi-dr1-dev to aosp-master

Change-Id: I4e937dcd8b96e932846eb122d43205d1a1f5af11
tree: ee9e11b23ccc14799bb69ee46edf58c994598cab
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml