Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 84e2adced3

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