Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: If7e5c42753d23089f61544998cfefcb775d33e63
Merged-In: I6031c354be928d5fab9243571ed423b929811ee1