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

* commit 'cffa893cff2bc2d5a14012b819b4080f8160b83c':