Revert 221736 "[android] Adds constants.GetOutDirectory() and co..."

trunk/src/build/android/pylib/gtest/test_package_exe.py

Index: trunk/src/build/android/pylib/gtest/test_package_exe.py
===================================================================
--- trunk/src/build/android/pylib/gtest/test_package_exe.py	(revision 222006)
+++ trunk/src/build/android/pylib/gtest/test_package_exe.py	(working copy)
@@ -28,9 +28,10 @@
       suite_name: Name of the test suite (e.g. base_unittests).
     """
     TestPackage.__init__(self, suite_name)
-    self.suite_path = os.path.join(constants.GetOutDirectory(), suite_name)
-    self._symbols_dir = os.path.join(constants.GetOutDirectory(),
-                                     'lib.target')
+    product_dir = os.path.join(cmd_helper.OutDirectory.get(),
+        constants.GetBuildType())
+    self.suite_path = os.path.join(product_dir, suite_name)
+    self._symbols_dir = os.path.join(product_dir, 'lib.target')
 
   #override
   def GetGTestReturnCode(self, adb):