Merge "Update for libnl 3.2.25"
Paul Stewart [Mon, 12 Dec 2016 21:48:05 +0000 (21:48 +0000)]

Trivial merge