am 1e7ae47d: Merge "Bring our "libresolv" stuff in line with glibc."

* commit '1e7ae47d40aad100fa16731418ac8af7b9919da7':
  Bring our "libresolv" stuff in line with glibc.