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

Change-Id: I48fcc144efb7e6e4de4620bfa5815123247c94d6