Merge "Revert "Send logcat over serial port instead of vsocket""