Merge "We no longer need our own icmp6.h --- bionic's is good enough."