Merge "adb: fix spurious usb write failure on Windows."