Merge 252604 "Don't use automatic toolchain if GYP_MSVS_VERSION ..."

build/gyp_chromium

Index: build/gyp_chromium
===================================================================
--- build/gyp_chromium	(revision 252634)
+++ build/gyp_chromium	(working copy)
@@ -437,7 +437,10 @@
   # If on windows, and the automatic toolchain has been installed by
   # depot_tools, then use it.
   vs2013_runtime_dll_dirs = None
-  if sys.platform in ('win32', 'cygwin'):
+  # If MSVS_VERSION is explicitly specified to be something other than 2013,
+  # don't use the automatic toolchain, as it currently only supports VS2013.
+  msvs_version = os.environ.get('GYP_MSVS_VERSION', '2013')
+  if sys.platform in ('win32', 'cygwin') and msvs_version.startswith('2013'):
     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
     toolchain = os.path.normpath(os.path.join(
         depot_tools_path, 'win_toolchain', 'vs2013_files'))