Merge "libsysutils: Fix race condition in SocketListener thread." into honeycomb