Merge "logd: klogd and Mediatek"