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

* commit '61e72dbc24de26fd54e09a30ec9e74ee9a22c306':
  ndk: Fix ipv6 related headers