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

Change-Id: I6789b0213d182662c7fbc0dd898b73c345dfe4c6