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

Merge commit '1d05df5ac17797cbb06c09ad9c6f91af5ec34fbe'

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