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

Change-Id: I7c405121411040231aa57a692c8620a55f566a25