Merge "Move libnetutils headers into libnetutils."