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

Change-Id: Iac5e0f8159f9164494588f3af1d9e07f1a678f17