am f9395185: (-s ours) Revert "- updates NetUtils to use new libnetutils headers"

Merge commit 'f93951851052f14e3263adff22266b61f487b018'

* commit 'f93951851052f14e3263adff22266b61f487b018':
  Revert "- updates NetUtils to use new libnetutils headers"