[Android] Refactor the native test wrappers. (RELAND)

build/apk_browsertest.gypi

Index: build/apk_browsertest.gypi
diff --git a/build/apk_test.gypi b/build/apk_browsertest.gypi
similarity index 85%
copy from build/apk_test.gypi
copy to build/apk_browsertest.gypi
index 3a66e3bfd1839da82260e56bb21576e7bb3b511a..316f52fb853323dfb5fb1eb19d8d0a583e06e705 100644
--- a/build/apk_test.gypi
+++ b/build/apk_browsertest.gypi
@@ -1,9 +1,9 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# 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.
 
 # This file is meant to be included into a target to provide a rule
-# to build APK based test suites.
+# to build APK-based browser test suites.
 #
 # To use this, create a gyp target with the following form:
 # {
@@ -11,7 +11,7 @@
 #   'type': 'none',
 #   'variables': {
 #     'test_suite_name': 'test_suite_name',  # string
-#     'input_jars_paths': ['/path/to/test_suite.jar', ... ],  # list
+#     'java_in_dir': 'path/to/java/dir',
 #   },
 #   'includes': ['path/to/this/gypi/file'],
 # }
@@ -23,6 +23,7 @@
     '<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands',
     '<(DEPTH)/build/android/pylib/remote/device/dummy/dummy.gyp:remote_device_dummy_apk',
     '<(DEPTH)/testing/android/appurify_support.gyp:appurify_support_java',
+    '<(DEPTH)/testing/android/native_test.gyp:native_test_java',
     '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
   ],
   'conditions': [
@@ -32,7 +33,6 @@
          'apk_name': '<(test_suite_name)',
          'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
          'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
-         'java_in_dir': '<(DEPTH)/testing/android/native_test/java',
          'native_lib_target': 'lib<(test_suite_name)',
          # TODO(yfriedman, cjhopman): Support managed installs for gtests.
          'gyp_managed_install': 0,