am 4fc8a0c1: Merge "Remove <netinet/icmp6.h> ni_* macros."

* commit '4fc8a0c1165537b693c900ac3e2c61470bd7e484':
  Remove <netinet/icmp6.h> ni_* macros.