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

Change-Id: Iac1c95effbb1baf53943866b6793c55996380e07
tree: b9b5784e6cc182b14959cf8896ab79d4b675ef85
  1. src/
  2. Android.bp
  3. MODULE_LICENSE_APACHE2
  4. NOTICE
  5. README.version