am 9ccfb95e: Merge change 24723 into eclair

Merge commit '9ccfb95e597a93020f2731c734c2a65e743fb601' into eclair-plus-aosp

* commit '9ccfb95e597a93020f2731c734c2a65e743fb601':
  Remove code duplication in InetAddress.getByAddress.