Merge "Revert "SocketListener: use poll() instead of select()""