Change Android GPU tests to use Chromium instead of content_shell.

tools/perf/chrome_telemetry_build/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/compiler/compiler.gni")
 
 if (is_win) {
   action("copy_cdb_to_output") {
     script = "//build/win/copy_cdb_to_output.py"
     inputs = [
@@ skipping 11 matching lines @@
     ]
   }
 }
 
 group("telemetry_chrome_test") {
   testonly = true
 
   if (is_android) {
     data_deps = [
       "//chrome/android:chrome_public_apk",
-
-      # TODO(stip): remove the content_shell dependency below after the GPU bots
-      # are switched over to use Chromium instead. crbug.com/616392.
-      "//content/shell:content_shell",
     ]
   } else {
     data_deps = [
       "//third_party/catapult/telemetry:bitmaptools",
     ]
 
     if (!is_mac) {
       # TODO(kbr): this used to be "//chrome". Had to change this to
       # chrome_initial temporarily to work around crbug.com/536192.
       data_deps += [ "//chrome:chrome_initial" ]
@@ skipping 33 matching lines @@
         "$root_out_dir/base.dll.pdb",
         "$root_out_dir/blink_platform.dll.pdb",
         "$root_out_dir/blink_web.dll.pdb",
         "$root_out_dir/content.dll.pdb",
       ]
     } else {
       data += [ "$root_out_dir/chrome_child.dll.pdb" ]
     }
   }
 }