Merge "logd: klogd crash" am: e23e0914ff am: 5118d8f633 am: 73ded18d31
am: fe51e78209

Change-Id: I8b396d45b526ead9a97d67f3c3afe9e81f55c32b