[automerger skipped] Merge Coral/Flame into AOSP master
am: 5d8c436063 -s ours
am skip reason: change_id Iaccc578f8a4dcde6ca969aea1c3e750b909d6027 with SHA1 2c38df4a04 is in history

Change-Id: I7da0ce47ceba3a014f6ceefc4ac201cd17746da4
tree: 72947112ccc6227b36e06cf930d670cf17bddd0f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg