Merge "logd: klogd crash (part deux)"