[automerger skipped] Merge Coral/Flame into AOSP master am: 65c1ecb961 -s ours am: f9f860d88e -s ours
am: 074c480e6f -s ours
am skip reason: change_id Idff1f3caff103926cd2cb267dab1d96bbb4daf33 with SHA1 ab8b1013a9 is in history

Change-Id: I15c1461a106e27781edc604844e7c1fec538ea89
tree: 0ec013b648cebf24d9a5c442df5eb532799df28b
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml