Revert of [Android] Refactor the native test wrappers.

build/android/pylib/gtest/test_package_apk.py

Index: build/android/pylib/gtest/test_package_apk.py
diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py
index 64478209ecf11f01726dcf40b644ae6ed875545c..9672f7aec8e882112d6cbb0f3661922c93bea534 100644
--- a/build/android/pylib/gtest/test_package_apk.py
+++ b/build/android/pylib/gtest/test_package_apk.py
@@ -30,14 +30,18 @@
       suite_name: Name of the test suite (e.g. base_unittests).
     """
     TestPackage.__init__(self, suite_name)
-    self.suite_path = os.path.join(
-        constants.GetOutDirectory(), '%s_apk' % suite_name,
-        '%s-debug.apk' % suite_name)
     if suite_name == 'content_browsertests':
+      self.suite_path = os.path.join(
+          constants.GetOutDirectory(), 'apks', '%s.apk' % suite_name)
       self._package_info = constants.PACKAGE_INFO['content_browsertests']
     elif suite_name == 'components_browsertests':
+      self.suite_path = os.path.join(
+          constants.GetOutDirectory(), 'apks', '%s.apk' % suite_name)
       self._package_info = constants.PACKAGE_INFO['components_browsertests']
     else:
+      self.suite_path = os.path.join(
+          constants.GetOutDirectory(), '%s_apk' % suite_name,
+          '%s-debug.apk' % suite_name)
       self._package_info = constants.PACKAGE_INFO['gtest']
 
   def _CreateCommandLineFileOnDevice(self, device, options):