Merge "adb: fix test_adb.py's adb server spawning on Windows."