am 5415f434: Merge change 25603 into eclair

Merge commit '5415f4344b4c9b9186e291909d5f369b6435011e' into eclair-plus-aosp

* commit '5415f4344b4c9b9186e291909d5f369b6435011e':
  Use native code to convert IP addresses to strings.