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

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