Do not call run_webkit_tests.py in android buildbot scripts.

Replace its usage by lint-test-expectations and run-webkit-tests, both
scripts found in third_party/WebKit/Tools/Scripts.

BUG=338338
TEST=None
R=dpranke@chromium.org,cmp@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#296883}

build/android/buildbot/bb_device_steps.py

@@ -26,6 +26,7 @@ from pylib.gtest import gtest_config
 CHROME_SRC_DIR = bb_utils.CHROME_SRC
 DIR_BUILD_ROOT = os.path.dirname(CHROME_SRC_DIR)
 CHROME_OUT_DIR = bb_utils.CHROME_OUT_DIR
+BK_SCRIPTS_DIR = 'third_party/WebKit/Tools/Scripts'
 
 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave')
 LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat')
@@ -286,9 +287,7 @@ def RunInstrumentationSuite(options, test, flunk_on_failure=True,
 def RunWebkitLint(target):
   """Lint WebKit's TestExpectation files."""
   bb_annotations.PrintNamedStep('webkit_lint')
-  RunCmd([SrcPath('webkit/tools/layout_tests/run_webkit_tests.py'),
-          '--lint-test-files',
-          '--chromium',
+  RunCmd([SrcPath(os.path.join(BK_SCRIPTS_DIR, 'lint-test-expectations')),
           '--target', target])
 
 
@@ -326,8 +325,8 @@ def RunWebkitLayoutTests(options):
     cmd_args.extend(
         ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)])
 
-  exit_code = RunCmd([SrcPath('webkit/tools/layout_tests/run_webkit_tests.py')]
-                     + cmd_args)
+  exit_code = RunCmd(
+      [SrcPath(os.path.join(BK_SCRIPTS_DIR, 'run-webkit-tests'))] + cmd_args)
   if exit_code == 255: # test_run_results.UNEXPECTED_ERROR_EXIT_STATUS
     bb_annotations.PrintMsg('?? (crashed or hung)')
   elif exit_code == 254: # test_run_results.NO_DEVICES_EXIT_STATUS