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

Change-Id: If98c5feac02f60641ed14463f9ff3e6eed924eba
tree: 186a510ce6d924ec1487b81475f05685b6552dd1
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS