Merge "adb: win32: fix adb shell"