[automerger skipped] Merge Coral/Flame into AOSP master
am: 3ea325f4c6 -s ours
am skip reason: change_id Ia3bb9bdf895124f099b269ba59f4b8afca76eddd with SHA1 adfdc35983 is in history

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