[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: a2cc3c5ea8  -s ours

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