am 76ed92c3: Merge "logd: better drop message merging"

* commit '76ed92c3c6882af801f8454a1dd9bf8e3a908ba2':
  logd: better drop message merging