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

Change-Id: I3120bdd5b9fa552747938593da4d8ed8f155f5fb