[automerger skipped] Merge Coral/Flame into AOSP master
am: 610328e9d2 -s ours
am skip reason: change_id I6b95cf1a731c4dc09a7897f3114e2ad6595d60bb with SHA1 3d613876e9 is in history

Change-Id: I06ddd91fcb3ec4b7ed7c12debf079c84e07ad5e6
tree: 968820f4602236beea51ae159b15e00f8e45f7ca
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/