am bc1403ee: am 643f3c2f: am 555d9198: Merge "Revert "logd: regression in log_strtok_r""

* commit 'bc1403ee6a4c8d221db89693bb137b1e8d393aab':
  Revert "logd: regression in log_strtok_r"