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

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