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

* commit 'e00aea9715d61fcf3816dbb0c9b9434081b317ef':
  ndk: Fix ipv6 related headers