Merge "Unhide NETLINK_NETFILTER constant"