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

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