Merge "fix adb_test Windows build"