Merge \\\\"Make klog_fd thread-safe and make klog_init a no-op.\\\\" am: 588b770063 am: 73d363bbc1 am: 7288ac3982
am: 6605b0b23a

Change-Id: I7d50818201e114fb65db8179c14b754afb069bdb