Merge "Update base test class."
diff --git a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
index 9588f7f..6fa3084 100644
--- a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
+++ b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
@@ -15,7 +15,7 @@
 -->
 <configuration description="Config for VTS BinderThroughputBenchmark test cases">
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="HidlHalTest.push" />
+        <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
         <option name="push" value="DATA/nativetest/binderThroughputTest/binderThroughputTest->/data/local/tmp/32/binderThroughputTest32" />
         <option name="push" value="DATA/nativetest64/binderThroughputTest/binderThroughputTest->/data/local/tmp/64/binderThroughputTest64" />
diff --git a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
index 1cf90dc..377b883 100644
--- a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
+++ b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
@@ -15,7 +15,7 @@
 -->
 <configuration description="Config for VTS BinderThroughputBenchmark test cases">
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="HidlHalTest.push" />
+        <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
         <option name="push" value="DATA/nativetest/binderThroughputTest/binderThroughputTest->/data/local/tmp/32/binderThroughputTest32" />
         <option name="push" value="DATA/nativetest64/binderThroughputTest/binderThroughputTest->/data/local/tmp/64/binderThroughputTest64" />