Reland Switch Android gtests to use generated wrapper scripts

scripts/slave/recipe_modules/chromium_tests/steps.py

 # Copyright 2014 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 re
 import string
 
 
 class Test(object):
   """
@@ skipping 254 matching lines @@
   def uses_local_devices(self):
     return True # pragma: no cover
 
   def isolate_target(self, _api):
     return self.target_name  # pragma: no cover
 
   def compile_targets(self, api):
     if self._override_compile_targets:
       return self._override_compile_targets
 
+    # TODO(GYP) Remove special case once fully converted to GN.
     if api.chromium.c.TARGET_PLATFORM == 'android':
-      return [self.target_name + '_apk']
+      return [self.target_name, self.target_name + '_apk']
 
     return [self.target_name]
 
   def run(self, api, suffix, test_filter=None):
     # Copy the list because run can be invoked multiple times and we modify
     # the local copy.
     args = self._args[:]
     is_android = api.chromium.c.TARGET_PLATFORM == 'android'
 
     if suffix == 'without patch':
@@ skipping 1554 matching lines @@
   def run(self, api, suffix, test_filter=None):
     api.chromium_android.coverage_report(upload=False)
     api.chromium_android.get_changed_lines_for_revision()
     api.chromium_android.incremental_coverage_report()
 
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]