Merge "Fix libnl so users can compile with old-style and uapi kernel headers."