Merge "logd: klogd: parse error"
am: c6f3b96bd8

* commit 'c6f3b96bd8b9b0ca366009db6b6e497761adb642':
  logd: klogd: parse error