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

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