Merge "Move internal functions out of libnetd_resolv's public headers"