Cherry-pick Skia infra fixes to m53 so that Windows and Android bots can run tests.

infra/bots/assets/win_toolchain/create_and_upload.py

Index: infra/bots/assets/win_toolchain/create_and_upload.py
diff --git a/infra/bots/assets/scripts/create_and_upload.py b/infra/bots/assets/win_toolchain/create_and_upload.py
similarity index 73%
copy from infra/bots/assets/scripts/create_and_upload.py
copy to infra/bots/assets/win_toolchain/create_and_upload.py
index 13564474771e8f5eac2e271bd7d39a9628da1681..d428ca4ef9df2352ea3627f1656e59fd27e6eef2 100755
--- a/infra/bots/assets/scripts/create_and_upload.py
+++ b/infra/bots/assets/win_toolchain/create_and_upload.py
@@ -20,6 +20,8 @@ import utils
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--gsutil')
+  parser.add_argument('--chrome_path')
+  parser.add_argument('--msvs_version', required=True)
   args = parser.parse_args()
 
   with utils.tmp_dir():
@@ -28,7 +30,12 @@ def main():
     upload_script = os.path.join(common.FILE_DIR, 'upload.py')
 
     try:
-      subprocess.check_call(['python', create_script, '-t', cwd])
+      cmd = ['python', create_script,
+             '-t', cwd,
+             '--msvs_version', args.msvs_version]
+      if args.chrome_path:
+        cmd.extend(['--chrome_path', args.chrome_path])
+      subprocess.check_call(cmd)
       cmd = ['python', upload_script, '-t', cwd]
       if args.gsutil:
         cmd.extend(['--gsutil', args.gsutil])