Merge "logd: logcat unexpected EOF on slow consoles"