am a9b706bd: am 66ad3429: Merge "gethnamaddr: make helper functions static"

Merge commit 'a9b706bd2b0814fcb45c4e8396c2bdddecb1f5de'

* commit 'a9b706bd2b0814fcb45c4e8396c2bdddecb1f5de':
  gethnamaddr: make helper functions static