Revert of win: Fix current toolchain path with old packaging (patchset #1 id:1...

Revert of win: Fix current toolchain path with old packaging (patchset #1 id:1 of https://codereview.chromium.org/1159433006/)

Reason for revert:
Breaking chromium waterfall.

Original issue's description:
> win: Fix current toolchain path with old packaging
> 
> I broke boringssl's use of depot_tools toolchain as I changed the
> name of the sdk path key. This happened to work in Chrome because
> src/ has fallback behaviour.
> 
> Restore the 'win8sdk' name when unpacking a current/old-style
> toolchain package (i.e. what everyone is still using).
> 
> TBR=dpranke@chromium.org
> R=davidben@chromium.org
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=295492

TBR=davidben@chromium.org,dpranke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1167753003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295493 0039d316-1c4b-4281-b951-d872f2087c98

win_toolchain/get_toolchain_if_necessary.py

@@ -290,16 +290,7 @@ def main():
 
     got_new_toolchain = True
 
-  data = {
-      'path': abs_target_dir,
-      'win_sdk': os.path.join(abs_target_dir, 'win_sdk'),
-      'wdk': os.path.join(abs_target_dir, 'wdk'),
-      'runtime_dirs': [
-        os.path.join(abs_target_dir, 'sys64'),
-        os.path.join(abs_target_dir, 'sys32'),
-      ],
-  }
-
+  win_sdk = os.path.join(abs_target_dir, 'win_sdk')
   try:
     with open(os.path.join(target_dir, 'VS_VERSION'), 'rb') as f:
       vs_version = f.read().strip()
@@ -307,10 +298,18 @@ def main():
     # Older toolchains didn't have the VS_VERSION file, and used 'win8sdk'
     # instead of just 'win_sdk'.
     vs_version = '2013'
-    data['win8sdk'] = os.path.join(abs_target_dir, 'win8sdk')
-
-  data['version'] = vs_version
+    win_sdk = os.path.join(abs_target_dir, 'win8sdk')
 
+  data = {
+      'path': abs_target_dir,
+      'version': vs_version,
+      'win_sdk': win_sdk,
+      'wdk': os.path.join(abs_target_dir, 'wdk'),
+      'runtime_dirs': [
+        os.path.join(abs_target_dir, 'sys64'),
+        os.path.join(abs_target_dir, 'sys32'),
+      ],
+  }
   with open(os.path.join(target_dir, '..', 'data.json'), 'w') as f:
     json.dump(data, f)