[Android] Fix generated scripts for junit tests.

chrome/chrome_tests.gypi

 # Copyright 2013 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.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 3095 matching lines @@
             '../base/base.gyp:base_java_test_support',
             '../base/base.gyp:base_junit_test_support',
             '../sync/sync.gyp:sync_java_test_support',
             '../testing/android/junit/junit_test.gyp:junit_test_support',
           ],
           'variables': {
             'main_class': 'org.chromium.testing.local.JunitTestMain',
             'src_paths': [
               'android/junit/',
             ],
+            'test_suite_name': 'chrome_junit_tests',
+            'test_type': 'junit',
           },
           'includes': [
             '../build/host_jar.gypi',
+            '../build/android/test_runner.gypi',
           ],
         },
         {
           # GN: //chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk
           'target_name': 'chromedriver_webview_shell_apk',
           'type': 'none',
           'variables': {
             'apk_name': 'ChromeDriverWebViewShell',
             'java_in_dir': 'test/chromedriver/test/webview_shell/java',
             'resource_dir': 'test/chromedriver/test/webview_shell/java/res',
@@ skipping 378 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }