Merge "Fix <sys/klog.h> to correspond to the kernel operations."