Merge "Add missing lock in SocketListener." into gingerbread