Merge "logd: remove SocketClient from LogBuffer and LogBufferElement"