am 7a29f404: Merge "Update getaddrinfo to RFC6724"

* commit '7a29f404e11d3346e79154b8e8d72a3215febced':
  Update getaddrinfo to RFC6724