Merge Coral/Flame into AOSP master Bug: 141248619 Change-Id: I0abf751c2d2f3b0065076886d4fd32d5cfb35cc6 Merged-In: Iaa098138703688167854d67f31e9b86a7cef1077