am 555d9198: Merge "Revert "logd: regression in log_strtok_r""

* commit '555d91985d174217c3e805997bcd86d9c94f5a6b':
  Revert "logd: regression in log_strtok_r"