Merge "More completely add NETLINK_NETFILTER constant."