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

Change-Id: I7ed760aa72ce4928165b6091078d6340c451c922
tree: c36a3fcf5520e484ac93dd012300c1ac1ed9ce05
  1. src/
  2. Android.bp
  3. MODULE_LICENSE_BSD_LIKE
  4. NOTICE
  5. README.version
  6. VERSION