Roll catapult to pick up Py3 revert.

This reverts commit 94d8f7cb (r814499) while updating to the
latest revision of catapult (f654dd2f).

The Python3 changes that I had landed in the earlier catapult
roll are causing crashes in v8, so this reverts them.

Unfortunately these changes require manual rolls since the
list of python dependencies changes with the roll :(.

Tbr: johnchen@chromium.org
Tbr: ntfschr@chromium.org
No-Presubmit: true
Bug: 941669
Bug: v8:11015
Bug: v8:11014
Change-Id: I01b450e6384d1841ba24a90e5f0fc96222049ac5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469282
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#817052}

BUILD.gn

@@ -1267,6 +1267,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

@@ -262,7 +262,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': '01898ca871b257ed8bd4437067a4ec8fc47e14f4',
+  'catapult_revision': 'f654dd2f225c165d794b01b649190d89841b32cb',
   # 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,4 +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/six/six.py
+//third_party/catapult/third_party/zipfile/zipfile_2_7_13.py

build/android/devil_chromium.pydeps

@@ -31,7 +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/six/six.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,7 +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/six/six.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

@@ -35,9 +35,9 @@
 ../../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/six/six.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,7 +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/six/six.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