Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Ia8348870b4e253d49779d14616616b0ff39a01ae
Merged-In: Ib75231cba9ef14ca179f19e3ed3db4e12a5a61f9