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

* commit '7e6f6965982183ebae357e61e7bad55b91e97cc9':
  Bring our "libresolv" stuff in line with glibc.