Merge "Fix libnetutils to build with clean uapi headers."