am de42d34c: Merge "logd: regression in log_strtok_r"

* commit 'de42d34cd5de2ca3ecc89b155ea866e98a5d5568':
  logd: regression in log_strtok_r