Merge "Revert "logd: regression in log_strtok_r""