am 473629d5: am f9ae390f: Merge "adb: win32: get test_adb.py running and passing 100%"

* commit '473629d564fbb90e5c08bc7006685fe47b8cadd0':
  adb: win32: get test_adb.py running and passing 100%