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

* commit 'ff41f149cc75d7719da1d8e688380ddeefa6f5a3':
  logd: regression in log_strtok_r