Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 67a0384522

Change-Id: Ie4f86c9a8f764be4b28cdcd87e4679d87c9b0fca
tree: d08005efa6f5393feab6c1ce0401a14da655cb54
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags