Merge "nsdispatch removal from getaddrinfo()"