Merge "Avoid pass-by-reference in C-style ABI of libnetd_resolv"