Merge "adb: win32: get test_adb.py running and passing 100%"