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

Change-Id: I88aab1d2290e1eb7b5cd38282f01cd993303665a