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

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