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

* commit '643f3c2fbf2089dabc8d3340b652cf354e0bcc4e':
  Revert "logd: regression in log_strtok_r"