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

Change-Id: Id895b2184f14ac2907cd7f1544db37d49e950ce8
tree: 60a258723a9585736991ee2948246f5214300a7a
  1. src/
  2. Android.bp
  3. LICENSE
  4. METADATA
  5. MODULE_LICENSE_APACHE2
  6. NOTICE