am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."

* commit 'cb599d34b94d638d8fca6aee267e006e7d68d663':