[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: ecf7904261  -s ours am: b9420a29db  -s ours
am: f8cf051340  -s ours

Change-Id: I3bd07d6a828910abb37721fab8f64a3e4ea20591
tree: 4483510c75d81dba7eb1ac167875950cbeae805b
  1. src/
  2. Android.bp
  3. COPYING
  4. MODULE_LICENSE_APACHE2