am 363963d6: am de42d34c: Merge "logd: regression in log_strtok_r"

* commit '363963d6131d8909b50773dce5df83239761fa79':
  logd: regression in log_strtok_r