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

Change-Id: I6c023c43d6918ae99c368d9a8f9d4253f219689e