Merge "Unhide NETLINK_NETFILTER constant"
am: 8efafa49db

Change-Id: I0d84114796051773935a52579e54b252122b9b63