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

Change-Id: Ie4d6c6110d7f7eb3c9c8bbc95320214835ffdf35