Merge "adb: fix adb usb operations on device." into nyc-dev