android: Remove _apk_run targets

They should no longer be needed after https://codereview.chromium.org/2851523002
and https://chromium-review.googlesource.com/497271

BUG=716117

Review-Url: https://codereview.chromium.org/2884303002
Cr-Commit-Position: refs/heads/master@{#472244}

testing/test.gni

@@ -220,15 +220,6 @@ template("test") {
       test_suite = _output_name
       test_type = "gtest"
     }
-
-    # TODO(GYP_GONE): Delete this after we've converted everything to GN.
-    # The _run targets exist only for compatibility w/ GYP.
-    group("${target_name}_apk_run") {
-      testonly = true
-      deps = [
-        ":${invoker.target_name}",
-      ]
-    }
   } else if (is_ios) {
     import("//build/config/ios/ios_sdk.gni")
     import("//build/config/ios/rules.gni")

tools/mb/mb.py

@@ -952,12 +952,6 @@ class MetaBuildWrapper(object):
     labels = []
     err = ''
 
-    def StripTestSuffixes(target):
-      for suffix in ('_apk_run', '_apk', '_run'):
-        if target.endswith(suffix):
-          return target[:-len(suffix)], suffix
-      return None, None
-
     for target in targets:
       if target == 'all':
         labels.append(target)
@@ -965,14 +959,10 @@ class MetaBuildWrapper(object):
         labels.append(target)
       else:
         if target in isolate_map:
-          stripped_target, suffix = target, ''
-        else:
-          stripped_target, suffix = StripTestSuffixes(target)
-        if stripped_target in isolate_map:
-          if isolate_map[stripped_target]['type'] == 'unknown':
+          if isolate_map[target]['type'] == 'unknown':
             err += ('test target "%s" type is unknown\n' % target)
           else:
-            labels.append(isolate_map[stripped_target]['label'] + suffix)
+            labels.append(isolate_map[target]['label'])
         else:
           err += ('target "%s" not found in '
                   '//testing/buildbot/gn_isolate_map.pyl\n' % target)