Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."