Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"