Merge "logd: klogd crash (part deux)" am: 96c36d35ce
am: e36dbdda43

Change-Id: I3a798ee2f11163d52047659dab5cf14745f9891a