am 6036a4ff: (-s ours) am cc552ea3: am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"

* commit '6036a4ff9ae28c095297b70720f39db2e3714b57':