am 2462513a: Merge "We no longer need our own icmp6.h --- bionic\'s is good enough."

* commit '2462513a52e7c25e4277bba1ca52303c83fa3625':
  We no longer need our own icmp6.h --- bionic's is good enough.