Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I68466b21b86708698c3813a35ba95beb83161f87
Merged-In: Ie8e878868c681902616859fb280b2bd232b294f1