Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Iebada2d86fa9f26910b3e7beb13ee51711d604f1
Merged-In: I374696687ea7d0f34b58be9c5af79364ea29232c