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

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