am d97a34af: am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."

* commit 'd97a34af49f6beafc21d5f459ea62b499544f9f3':
  Fix libnetutils to build with clean uapi headers.