Merge "Hide sockaddr_union from libnetd_resolv's public headers"