Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 6c1117b7a1

Change-Id: I2c520d3b25bd5227dbbbc1864da0e65c92c1bf97
tree: a4f0fe646cf533aa553e2eba20bcec4a585fed6e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE