Merge "SocketListener: use poll() instead of select()" am: 51f0f7e791
am: 29cf429dc8

Change-Id: Ib1cf1e148ca7e78cd77013a837a7e8b6eaaeb33b