Revert "Roll catapult to 532e564 and update for changes in it."

This reverts commit 9bdc5ccb.

Reason for revert: Reverting until I can fix the `import six` issues more cleanly.

Original change's description:
> Roll catapult to 532e564 and update for changes in it.
>
> This CL rolls //third_party/catapult to
> 532e564f622742fc93a7f91dd3556d711e778a7e and picks up
>
> https://chromium-review.googlesource.com/c/catapult/+/2450450
>
> which removes zipfile_2_7_13.py as a dependency. This CL
> also updates the corresponding Chromium .pydeps files that mentioned
> it.
>
> That change also added a dependency on `six`, which seems to be
> pervasively assumed in other parts of the catapult codebase as
> present in the environment; however, it isn't guaranteed to be
> there in the chromium compile-time python build, so this adds
> that as needed as well.
>
> TBR=bsheedy@chromium.org
>
> Bug: 1112471
> Change-Id: I849355a5bdc18847dcbf39f3d3a9e9fbf428e3be
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2449938
> Commit-Queue: Dirk Pranke <dpranke@google.com>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Reviewed-by: John Chen <johnchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#814062}

TBR=dpranke@google.com,bsheedy@chromium.org,johnchen@chromium.org

Change-Id: I8dc0ccc9819eb5cd7de6d9fab4ec9a23c485ca09
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1112471, 1135502
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453150
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#814255}

BUILD.gn

@@ -1263,6 +1263,7 @@ if (!is_ios) {
       "//third_party/catapult/common/py_utils/",
       "//third_party/catapult/devil/",
       "//third_party/catapult/dependency_manager/",
+      "//third_party/catapult/third_party/zipfile/",
       "//third_party/catapult/third_party/typ/",
       "//third_party/depot_tools/pylint",
       "//third_party/depot_tools/pylint-1.5",

DEPS

@@ -258,7 +258,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '532e564f622742fc93a7f91dd3556d711e778a7e',
+  'catapult_revision': '83c2cb1060772ddd0e096c49918785afb11148b4',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.

android_webview/tools/run_cts.pydeps

@@ -74,3 +74,4 @@
 //third_party/catapult/devil/devil/utils/timeout_retry.py
 //third_party/catapult/devil/devil/utils/watchdog_timer.py
 //third_party/catapult/devil/devil/utils/zip_utils.py
+//third_party/catapult/third_party/zipfile/zipfile_2_7_13.py

build/android/devil_chromium.py

@@ -11,8 +11,6 @@ from pylib.constants import host_paths
 
 if host_paths.DEVIL_PATH not in sys.path:
   sys.path.append(host_paths.DEVIL_PATH)
-if host_paths.SIX_PATH not in sys.path:
-  sys.path.append(host_paths.SIX_PATH)
 
 from devil import devil_env
 from devil.android.ndk import abis

build/android/devil_chromium.pydeps

@@ -31,6 +31,7 @@
 ../../third_party/catapult/devil/devil/utils/reraiser_thread.py
 ../../third_party/catapult/devil/devil/utils/timeout_retry.py
 ../../third_party/catapult/devil/devil/utils/watchdog_timer.py
+../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
 devil_chromium.py
 pylib/__init__.py
 pylib/constants/__init__.py

build/android/gyp/create_bundle_wrapper_script.pydeps

@@ -62,6 +62,7 @@
 ../../../third_party/catapult/devil/devil/utils/timeout_retry.py
 ../../../third_party/catapult/devil/devil/utils/watchdog_timer.py
 ../../../third_party/catapult/devil/devil/utils/zip_utils.py
+../../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
 ../../../third_party/jinja2/__init__.py
 ../../../third_party/jinja2/_compat.py
 ../../../third_party/jinja2/bccache.py

build/android/pylib/constants/host_paths.py

@@ -23,8 +23,6 @@ ANDROID_PLATFORM_DEVELOPMENT_SCRIPTS_PATH = os.path.join(
 BUILD_PATH = os.path.join(DIR_SOURCE_ROOT, 'build')
 DEVIL_PATH = os.path.join(
     DIR_SOURCE_ROOT, 'third_party', 'catapult', 'devil')
-SIX_PATH = os.path.join(
-    DIR_SOURCE_ROOT, 'third_party', 'catapult', 'third_party', 'six')
 TRACING_PATH = os.path.join(
     DIR_SOURCE_ROOT, 'third_party', 'catapult', 'tracing')
 

build/android/resource_sizes.pydeps

@@ -37,6 +37,7 @@
 ../../third_party/catapult/devil/devil/utils/watchdog_timer.py
 ../../third_party/catapult/third_party/vinn/vinn/__init__.py
 ../../third_party/catapult/third_party/vinn/vinn/_vinn.py
+../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
 ../../third_party/catapult/tracing/tracing/__init__.py
 ../../third_party/catapult/tracing/tracing/value/__init__.py
 ../../third_party/catapult/tracing/tracing/value/convert_chart_json.py

build/android/test_runner.pydeps

@@ -95,6 +95,7 @@
 ../../third_party/catapult/devil/devil/utils/timeout_retry.py
 ../../third_party/catapult/devil/devil/utils/watchdog_timer.py
 ../../third_party/catapult/devil/devil/utils/zip_utils.py
+../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
 ../../third_party/colorama/src/colorama/__init__.py
 ../../third_party/colorama/src/colorama/ansi.py
 ../../third_party/colorama/src/colorama/ansitowin32.py

chrome/test/chromedriver/test/run_py_tests.pydeps

@@ -78,6 +78,7 @@
 ../../../../third_party/catapult/telemetry/third_party/websocket-client/websocket/_url.py
 ../../../../third_party/catapult/telemetry/third_party/websocket-client/websocket/_utils.py
 ../../../../third_party/catapult/third_party/gsutil/third_party/monotonic/monotonic.py
+../../../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
 ../chrome_paths.py
 ../client/chromedriver.py
 ../client/command_executor.py

testing/scripts/run_android_wpt.pydeps

@@ -144,3 +144,4 @@
 //third_party/catapult/third_party/typ/typ/stats.py
 //third_party/catapult/third_party/typ/typ/test_case.py
 //third_party/catapult/third_party/typ/typ/version.py
+//third_party/catapult/third_party/zipfile/zipfile_2_7_13.py