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

Change-Id: I3ab5722a32e9c7cca0706bef1c5e568e9abf862e
tree: 69052b7fc345e8c3369f381b8537d8198feadc0c
  1. abr/
  2. inc/
  3. src/
  4. Android.bp
  5. LICENSE
  6. MODULE_LICENSE_APACHE2
  7. NOTICE