Merge "Remove <netinet/icmp6.h> ni_* macros."