Fix test data push for APK tests.

build/android/single_test_runner.py

Index: build/android/single_test_runner.py
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py
index 35f14369fbab56a216682810dc91cb6991a95d0b..72874d4f1e17115588d5b712cd4fc2db8172fa66 100644
--- a/build/android/single_test_runner.py
+++ b/build/android/single_test_runner.py
@@ -76,12 +76,12 @@ class SingleTestRunner(BaseTestRunner):
   def _GetFilterFileName(self):
     """Returns the filename of gtest filter."""
     return os.path.join(sys.path[0], 'gtest_filter',
-        self.test_package.GetDisabledTestsBaseFileName() + '_disabled')
+        self.test_package.test_suite_basename + '_disabled')
 
   def _GetAdditionalEmulatorFilterName(self):
     """Returns the filename of additional gtest filter for emulator."""
     return os.path.join(sys.path[0], 'gtest_filter',
-        self.test_package.GetDisabledTestsBaseFileName() +
+        self.test_package.test_suite_basename +
         '_emulator_additional_disabled')
 
   def GetDisabledTests(self):