Merge "Make klog_fd thread-safe and make klog_init a no-op."