Merge "logd: klogd: deal with htc modified printk" into nyc-mr1-dev