Merge "Bring our "libresolv" stuff in line with glibc."