am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."

* commit '047a285d41e3fe0b1a8071ec19f436baf6f187b2':
  Fix <sys/klog.h> to correspond to the kernel operations.