am 8dd195c5: am 7a29f404: Merge "Update getaddrinfo to RFC6724"

* commit '8dd195c509eed45d1e4b5ab91ddc2ef56fcb0737':
  Update getaddrinfo to RFC6724