Merge "Unhide NETLINK_NETFILTER constant" am: 8efafa49db
am: 35efc80e47

Change-Id: Ic8de6412097ea56bd751045a7c691330fc6ad112