Merge "logd: remove SocketClient from LogBuffer and LogBufferElement" am: 227dd4f807

Change-Id: I9e9fdaa8b54acba3f2e9d9848c6e3cbbd7d5484f