Revert 273386 "Add gpu-rasterization test to Android gpu testbot."

Reason: New gpu_rasterization_tests failed.

> Add gpu-rasterization test to Android gpu testbot.
> 
> BUG=368495
> R=navabi@chromium.org, navabi@google.com, skyostil@chromium.org
> 
> Review URL: https://codereview.chromium.org/279993002

BUG=368495
TBR=alokp@chromium.org

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@273426 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/buildbot/bb_device_steps.py

@@ -456,10 +456,10 @@ def RunWebRTCNativeTests(options):
 
 
 def RunGPUTests(options):
-  revision = _GetRevision(options)
-  builder_name = options.build_properties.get('buildername', 'noname')
+  InstallApk(options, INSTRUMENTATION_TESTS['ContentShell'], False)
 
-  bb_annotations.PrintNamedStep('pixel_tests')
+  bb_annotations.PrintNamedStep('gpu_tests')
+  revision = _GetRevision(options)
   RunCmd(['content/test/gpu/run_gpu_test.py',
           'pixel',
           '--browser',
@@ -472,23 +472,14 @@ def RunGPUTests(options):
           '--os-type',
           'android',
           '--test-machine-name',
-          EscapeBuilderName(builder_name)])
+          EscapeBuilderName(
+              options.build_properties.get('buildername', 'noname'))])
 
   bb_annotations.PrintNamedStep('webgl_conformance_tests')
   RunCmd(['content/test/gpu/run_gpu_test.py',
           '--browser=android-content-shell', 'webgl_conformance',
           '--webgl-conformance-version=1.0.1'])
 
-  bb_annotations.PrintNamedStep('gpu_rasterization_tests')
-  RunCmd(['content/test/gpu/run_gpu_test.py',
-          'gpu_rasterization',
-          '--browser',
-          'android-content-shell',
-          '--build-revision',
-          str(revision),
-          '--test-machine-name',
-          EscapeBuilderName(builder_name)])
-
 
 def GetTestStepCmds():
   return [

android/buildbot/bb_run_bot.py

@@ -164,9 +164,7 @@ def GetBotStepMap():
       B('fyi-component-builder-tests-dbg',
         H(compile_step, extra_gyp='component=shared_library'),
         T(std_tests, ['--experimental', flakiness_server])),
-      B('gpu-builder-tests-dbg',
-        H(compile_step),
-        T(['gpu'], ['--install=ContentShell'])),
+      B('gpu-builder-tests-dbg', H(compile_step), T(['gpu'])),
       # Pass empty T([]) so that logcat monitor and device status check are run.
       B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression']), T([])),
       B('perf-tests-rel', H(std_test_steps),