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

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