Revert of Revert of Do not call run_webkit_tests.py in android buildbot...

Revert of Revert of Do not call run_webkit_tests.py in android buildbot scripts. (patchset #1 id:1 of https://codereview.chromium.org/609713002/)

Reason for revert:
That revert was apparrently a really bad idea. Now all the bots are failing. Reverting the revert and hoping that will bring us back to one failing bot.

Original issue's description:
> Revert of Do not call run_webkit_tests.py in android buildbot scripts. (patchset #2 id:20001 of https://codereview.chromium.org/603563002/)
>
> Reason for revert:
> Makes the webkit_lint step fail on android bots:
>
> @@@BUILD_STEP webkit_lint@@@
> > /b/build/slave/WebKit_Android__Nexus4_/build/src/third_party/WebKit/Tools/Scripts/lint-test-expectations --target Release
> Usage: lint-test-expectations [options]
>
> lint-test-expectations: error: no such option: --target
> < /b/build/slave/WebKit_Android__Nexus4_/build/src/third_party/WebKit/Tools/Scripts/lint-test-expectations --target Release
> ERROR: process exited with code 2
> @@@STEP_FAILURE@@@
>
> Original issue's description:
> > 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
> >
> > Committed: https://crrev.com/9c330bf94b161a4a19b1bcccb33b169843b4fd10
> > Cr-Commit-Position: refs/heads/master@{#296883}
>
> TBR=cmp@chromium.org,dpranke@chromium.org,tfarina@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=338338
>
> Committed: https://crrev.com/ce392c3ccf021a094e21ffa3ca3babeb313b4821
> Cr-Commit-Position: refs/heads/master@{#296892}

TBR=cmp@chromium.org,dpranke@chromium.org,tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=338338

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

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

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