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

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