Revert of lightweight builds archiving for mac and win64

scripts/slave/recipes/chromium.expected/full_chromium_perf_Linux_Builder.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Linux_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Linux_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Linux_Builder.json
index 930582080203760bc6f56a1c69c3fe6a598510ca..e24626dbfe051bb3840ed84ee71a49492425d1cd 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Linux_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Linux_Builder.json
@@ -298,22 +298,15 @@
       "--src-dir",
       "[BUILDER_CACHE]/Linux_Builder/src",
       "--build-url",
-      "gs://chrome-test-builds/official-by-commit/Linux Builder",
+      "gs://chrome-perf/Linux Builder",
       "--build_revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
-      "--include-files",
-      "chrome,chrome_100_percent.pak,chrome_200_percent.pak,default_apps,icudtl.dat,libwidevinecdm.so,locales,nacl_helper,nacl_helper_bootstrap,nacl_irt_x86_64.nexe,natives_blob.bin,PepperFlash,product_logo_48.png,resources.pak,snapshot_blob.bin,xdg-mime,xdg-settings",
-      "--strip-files",
-      "chrome,nacl_helper",
-      "--not-include-extra",
-      "--build_revision",
-      "170242",
       "--factory-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Linux Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Linux Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
     ],
-    "name": "package build for bisect"
+    "name": "package build"
   },
   {
     "allow_subannotations": true,
@@ -333,15 +326,22 @@
       "--src-dir",
       "[BUILDER_CACHE]/Linux_Builder/src",
       "--build-url",
-      "gs://chrome-perf/Linux Builder",
+      "gs://chrome-test-builds/official-by-commit/Linux Builder",
       "--build_revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
+      "--include-files",
+      "chrome,chrome_100_percent.pak,chrome_200_percent.pak,default_apps,icudtl.dat,libwidevinecdm.so,locales,nacl_helper,nacl_helper_bootstrap,nacl_irt_x86_64.nexe,natives_blob.bin,PepperFlash,product_logo_48.png,resources.pak,snapshot_blob.bin,xdg-mime,xdg-settings",
+      "--strip-files",
+      "chrome,nacl_helper",
+      "--exclude-extra",
+      "--build_revision",
+      "170242",
       "--factory-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Linux Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Linux Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
     ],
-    "name": "package build"
+    "name": "package build for bisect"
   },
   {
     "cmd": [],