[automerger skipped] Merge Coral/Flame into AOSP master
am: 4b5f83a50b -s ours
am skip reason: change_id Iffe00adb25bcd35be3bfd862474590f5def41984 with SHA1 4a9d3c3b43 is in history

Change-Id: Ibdc2f79dd580a18fd7a04da84a85bec08767de59
tree: 968f68f33a3343c9465d932ec7cde68467fcecf8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. OWNERS