[automerger skipped] Merge Coral/Flame into AOSP master
am: 37b6abce97 -s ours
am skip reason: change_id I24972c8448e6dee5ef1e223745319cf4eadd9cd2 with SHA1 d749a271fd is in history

Change-Id: I8d5b1afc68088857af52748c0cbd32d1e8717153
tree: 2d2f128ebb49e7fce0b3d8ce6ac3f845d5de59a0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS