[Android] Fix generated scripts for junit tests.

content/content_tests.gypi

 # Copyright (c) 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': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 2164 matching lines @@
             'content.gyp:content_java',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
             '../testing/android/junit/junit_test.gyp:junit_test_support',
           ],
           'variables': {
             'main_class': 'org.chromium.testing.local.JunitTestMain',
             'src_paths': [
               'public/android/junit/',
             ],
+            'test_suite_name': 'content_junit_tests',
+            'test_type': 'junit',
           },
           'includes': [
             '../build/host_jar.gypi',
+            '../build/android/test_runner.gypi',
           ],
         },
       ],
       'conditions': [
         ['test_isolation_mode != "noop"',
           {
             'targets': [
               {
                 'target_name': 'content_browsertests_apk_run',
                 'type': 'none',
@@ skipping 33 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }