Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."