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

Change-Id: I5d2846f762aa31c26101153290505f6ccb9008dc