Merge "Remove non-existing klog_close()"