[automerger skipped] Merge Coral/Flame into AOSP master
am: b03eb11e8c -s ours
am skip reason: change_id I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb with SHA1 8701769e72 is in history

Change-Id: Ib02f8e2cbb9ea7a05d030b88df78bb781310198b
tree: b0389e33dcdd2297db76e6a1742dfc244d22ee1a
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS