Merge "adb: keep all asocket operations in the main thread."