Merge "Make bionic's <netinet/icmp6.h> standalone, like glibc's."