Merge change 24723 into eclair

* changes:
  Remove code duplication in InetAddress.getByAddress.