Merge "Remove deprecated and unused constants from <sys/klog.h>."