am 2128eb22: am 61e72dbc: Merge "ndk: Fix ipv6 related headers"

* commit '2128eb22fd24ff4c6ec955f79950e0cebf7e448c':
  ndk: Fix ipv6 related headers