[wptrunner] Switch run_android_wpt.py to manually rolled WPT

Due to mandatory code review, we need to migrate off of the
automatic copy of tools/ in external/wpt, and instead use the
manually rolled copy in blinkpy.

Bug: 1165950
Change-Id: Ib38a8db4de3d52e2b590b7aaef35b5c01bdaad91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2626048Reviewed-by: Rakib Hasan <rmhasan@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Auto-Submit: Stephen McGruer <smcgruer@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#844284}

testing/scripts/run_android_wpt.py

@@ -14,7 +14,7 @@ executable directly rather than using python run_android_wpt.py so that
 WPT dependencies in Chromium vpython are found.
 
 If you need more advanced test control, please use the runner located at
-//third_party/blink/web_tests/external/wpt/wpt.
+//third_party/blink/tools/blinkpy/third_party/wpt/wpt/wpt.
 
 Here's the mapping [isolate script flag] : [wpt flag]
 --isolated-script-test-output : --log-chromium
@@ -44,7 +44,8 @@ BUILD_ANDROID = os.path.join(SRC_DIR, 'build', 'android')
 BLINK_TOOLS_DIR = os.path.join(
     SRC_DIR, 'third_party', 'blink', 'tools')
 CATAPULT_DIR = os.path.join(SRC_DIR, 'third_party', 'catapult')
-DEFAULT_WPT = os.path.join(wpt_common.WEB_TESTS_DIR, 'external', 'wpt', 'wpt')
+DEFAULT_WPT = os.path.join(
+    BLINK_TOOLS_DIR, 'blinkpy', 'third_party', 'wpt', 'wpt', 'wpt')
 PYUTILS = os.path.join(CATAPULT_DIR, 'common', 'py_utils')
 
 if PYUTILS not in sys.path:
@@ -132,6 +133,7 @@ class WPTAndroidAdapter(wpt_common.BaseWptScriptAdapter):
     rest_args.extend(["--venv=../../", "--skip-venv-setup"])
 
     rest_args.extend(["run",
+      "--tests=" + wpt_common.EXTERNAL_WPT_TESTS_DIR,
       "--test-type=" + self.options.test_type,
       "--webdriver-binary",
       self.options.webdriver_binary,