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

* commit 'dfdff5e4800b7d4e931be0eb533a5487aefa5ae7':
  logd: better drop message merging