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

* commit 'e31c45c9fa5e0d2853941282e619b753550b82ae':
  Make bionic's <netinet/icmp6.h> standalone, like glibc's.