Merge "ndk: Fix ipv6 related headers"