am 1cf3dbce: Merge change 25160 into eclair

Merge commit '1cf3dbce0b94ae5427ef19422224627e20808364' into eclair-plus-aosp

* commit '1cf3dbce0b94ae5427ef19422224627e20808364':
  Make getHostByAddr and getHostByName return the proper object type.