[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 1118a8c6e3  -s ours

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