Merge "Update getaddrinfo to RFC6724"