Merge "ndk: minor update to <netinet/...> headers."