Merge "Add support for poll()-ing nlsockets"