Merge "Fix adb proxy get device id on windows"