Merge "adb: fix test_adb.py's adb server spawning on Windows." am: 6d2ace3684
am: a128b13964

Change-Id: I380bc6d9dd80f49deca4d9a703d7962a939dfeda