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

* commit '060527891123da522e56e5f0879b968ba5f7d96c':
  logd: klogd: parse error