[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 3590abda18  -s ours

Change-Id: I900d8dd75d23ffa131c51b615815b40aa0951c44
tree: fb8b7bf227edcd2f7400ac61d8b0210aee339b70
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS