am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"

* commit '3b5b1328173b4914ccc3c50bdd5eaa046dbd6cd7':
  adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL