Snap for 4517567 from 54515db67530b759f10a0edb53e6bbadc954f6e7 to pi-release Change-Id: I6d7085d30407c33465b5c66501575e77418a3603

commit: 9b760c2024378d200424e82be908e884d8db36c0 [log] [tgz]
author: android-build-team Robot <android-build-team-robot@google.com> Sun Dec 24 08:31:37 2017 +0000
committer: android-build-team Robot <android-build-team-robot@google.com> Sun Dec 24 08:31:37 2017 +0000
tree: 0889077a52ba8b6047198e2508f80c8cae715ec9
parent: e08e5cf1a5dd65c2029dfa2842cd5685448b3f2b [diff]
parent: 54515db67530b759f10a0edb53e6bbadc954f6e7 [diff]
diff --git a/config/audio/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/V2_0/func_fuzzer/AndroidTest.xml
index 502968e..6aedc4a 100644
--- a/config/audio/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio@2.0"/>

diff --git a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
index a4a4c2b..35520e9 100644
--- a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio@2.0"/>

diff --git a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
index 13bbdad..a2a406c 100644
--- a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioCommonV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.common@2.0"/>

diff --git a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
index f817873..e6730cb 100644
--- a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioCommonV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.common@2.0"/>

diff --git a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
index e9e9f83..063b719 100644
--- a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioEffectV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.effect@2.0"/>

diff --git a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
index 0fab484..78636a5 100644
--- a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioEffectV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.effect@2.0"/>

diff --git a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
index 3ea65ff..55bb049 100644
--- a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveEvsV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.evs@1.0"/>

diff --git a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
index f8bbd26..6b14201 100644
--- a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveEvsV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.evs@1.0"/>

diff --git a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
index 25dfe0e..82be63b 100644
--- a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.0"/>

diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
index 2345c67..6c9de56 100644
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.0"/>

diff --git a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
index 8f8deb2..6471172 100644
--- a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.1"/>

diff --git a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
index c66d086..e2b7731 100644
--- a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.1"/>

diff --git a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
index df0dafd..626961e 100644
--- a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBiometricsFingerprintV2_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>

diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
index dcbe710..1688c8a 100644
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBiometricsFingerprintV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>

diff --git a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
index c44e5c3..d3ee104 100644
--- a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBluetoothV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.bluetooth@1.0"/>

diff --git a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
index 914e788..68f3ea0 100644
--- a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBluetoothV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.bluetooth@1.0"/>

diff --git a/config/boot/V1_0/func_fuzzer/AndroidTest.xml b/config/boot/V1_0/func_fuzzer/AndroidTest.xml
index 230fe9d..9eb038e 100644
--- a/config/boot/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBootV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.boot@1.0"/>

diff --git a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
index 9974345..ead7944 100644
--- a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBootV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.boot@1.0"/>

diff --git a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
index 6daf00a..c5818c5 100644
--- a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.0"/>

diff --git a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
index d147169..9be7686 100644
--- a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.0"/>

diff --git a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
index 0b4e5c0..2cc9cd6 100644
--- a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.1"/>

diff --git a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
index 47cf531..e65ef2c 100644
--- a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.1"/>

diff --git a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
index 1118e4f..c6624e9 100644
--- a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraCommonV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.common@1.0"/>

diff --git a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
index d70762b..c543faa 100644
--- a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraCommonV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.common@1.0"/>

diff --git a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
index cf9c197..b33e9da 100644
--- a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@1.0"/>

diff --git a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
index d66e2bc..7c52faf 100644
--- a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@1.0"/>

diff --git a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
index 3059ee4..16efacd 100644
--- a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV3_2FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.2"/>

diff --git a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
index 09e218d..1df6915 100644
--- a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV3_2IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.2"/>

diff --git a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
index 0106247..7e2d55c 100644
--- a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraMetadataV3_2FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.2"/>

diff --git a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
index 79cce91..589d19c 100644
--- a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraMetadataV3_2IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.2"/>

diff --git a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
index f125ae1..435fe1d 100644
--- a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraProviderV2_4FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.provider@2.4"/>

diff --git a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
index 8379609..129b5b5 100644
--- a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraProviderV2_4IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.provider@2.4"/>

diff --git a/config/cas/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
index c52320d..96ef1d9 100644
--- a/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/cas/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCasV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.cas@1.0"/>

diff --git a/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
index b0b8505..9be44e7 100644
--- a/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCasNativeV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.cas.native@1.0"/>

diff --git a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml b/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
index c7fa95e..db5d263 100644
--- a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalConfigstoreV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.configstore@1.0"/>

diff --git a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
index 46194da..11933fc 100644
--- a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalConfigstoreV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.configstore@1.0"/>

diff --git a/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
index c168057..c171110 100644
--- a/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalConfigstoreV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.configstore@1.1"/>

diff --git a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
index ad5bdfe..edcd73f 100644
--- a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalContexthubV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>

diff --git a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
index 006bde4..8c227c1 100644
--- a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalContexthubV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>

diff --git a/config/drm/V1_0/func_fuzzer/AndroidTest.xml b/config/drm/V1_0/func_fuzzer/AndroidTest.xml
index f5058c3..492aad9 100644
--- a/config/drm/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDrmV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.drm@1.0"/>

diff --git a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
index bb054e5..e617365 100644
--- a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDrmV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.drm@1.0"/>

diff --git a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
index 47cae29..16471d8 100644
--- a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDumpstateV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.dumpstate@1.0"/>

diff --git a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
index cf39ad8..441743c 100644
--- a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDumpstateV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.dumpstate@1.0"/>

diff --git a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
index 0c3df52..a75eeab 100644
--- a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGatekeeperV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gatekeeper@1.0"/>

diff --git a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
index f5b6f8c..f5773b5 100644
--- a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGatekeeperV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gatekeeper@1.0"/>

diff --git a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml b/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
index 1cde5e4..3290c62 100644
--- a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGnssV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gnss@1.0"/>

diff --git a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
index 4b6176a..f126f85 100644
--- a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGnssV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gnss@1.0"/>

diff --git a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
index c95b9f6..4611094 100644
--- a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsAllocatorV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.allocator@2.0"/>

diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
index b4b1ed4..c43032e 100644
--- a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsAllocatorV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.allocator@2.0"/>

diff --git a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
index ef93683..e73f10a 100644
--- a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsBufferqueueV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.bufferqueue@1.0"/>

diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
index a4b576d..77fd564 100644
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsBufferqueueV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.bufferqueue@1.0"/>

diff --git a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
index ad3bb30..053eeb0 100644
--- a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsCommonV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.0"/>

diff --git a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
index 61fa5e5..02791bc 100644
--- a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsCommonV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.0"/>

diff --git a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
index fd1ada7..d1bd510 100644
--- a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsComposerV2_1FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.1"/>

diff --git a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
index 6ebb2d6..78a07b4 100644
--- a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsComposerV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.1"/>

diff --git a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
index 602df15..522e9c7 100644
--- a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsMapperV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.0"/>

diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
index 2f9d2b0..6135f96 100644
--- a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsMapperV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.0"/>

diff --git a/config/health/V1_0/func_fuzzer/AndroidTest.xml b/config/health/V1_0/func_fuzzer/AndroidTest.xml
index cee1aa0..42261e6 100644
--- a/config/health/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalHealthV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.health@1.0"/>

diff --git a/config/health/V1_0/iface_fuzzer/AndroidTest.xml b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
index ba5ae5d..34735ac 100644
--- a/config/health/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalHealthV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.health@1.0"/>

diff --git a/config/ir/V1_0/func_fuzzer/AndroidTest.xml b/config/ir/V1_0/func_fuzzer/AndroidTest.xml
index 3d46f11..706aa64 100644
--- a/config/ir/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalIrV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.ir@1.0"/>

diff --git a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
index 1987f55..0dc1000 100644
--- a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalIrV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.ir@1.0"/>

diff --git a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
index eb20393..7aa6695 100644
--- a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalKeymasterV3_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>

diff --git a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
index 0bdae4d..cc1eeed 100644
--- a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalKeymasterV3_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>

diff --git a/config/light/V2_0/func_fuzzer/AndroidTest.xml b/config/light/V2_0/func_fuzzer/AndroidTest.xml
index 44b1702..11d2b26 100644
--- a/config/light/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalLightV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.light@2.0"/>

diff --git a/config/light/V2_0/iface_fuzzer/AndroidTest.xml b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
index f2857a4..c96eddd 100644
--- a/config/light/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalLightV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.light@2.0"/>

diff --git a/config/media/V1_0/func_fuzzer/AndroidTest.xml b/config/media/V1_0/func_fuzzer/AndroidTest.xml
index e03ae4d..a817c8d 100644
--- a/config/media/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media@1.0"/>

diff --git a/config/media/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
index d9e0f55..8815d80 100644
--- a/config/media/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media@1.0"/>

diff --git a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
index 72e474e..c7f2ded 100644
--- a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaOmxV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>

diff --git a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
index afe5e4f..048a1f2 100644
--- a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaOmxV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>

diff --git a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
index ee2f8ff..1a74186 100644
--- a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMemtrackV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0"/>

diff --git a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
index 7e17e6c..64541b4 100644
--- a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMemtrackV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0"/>

diff --git a/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml b/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
index f1bac48..4fa2460 100644
--- a/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalNeuralnetworksV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.neuralnetworks@1.0"/>

diff --git a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml b/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
index 0b8368a..c32ed9e 100644
--- a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalNfcV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>

diff --git a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
index 7d9bea5..ee578cb 100644
--- a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalNfcV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>

diff --git a/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml b/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
index ee49557..bba2137 100644
--- a/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalOemlockV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.oemlock@1.0"/>

diff --git a/config/power/V1_0/func_fuzzer/AndroidTest.xml b/config/power/V1_0/func_fuzzer/AndroidTest.xml
index 0469cb4..35903dc 100644
--- a/config/power/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalPowerV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.power@1.0"/>

diff --git a/config/power/V1_0/iface_fuzzer/AndroidTest.xml b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
index b78c77b..dbc2e28 100644
--- a/config/power/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalPowerV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.power@1.0"/>

diff --git a/config/power/V1_1/iface_fuzzer/AndroidTest.xml b/config/power/V1_1/iface_fuzzer/AndroidTest.xml
index 8bed22c..8ad8c2c 100644
--- a/config/power/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalPowerV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.power@1.1"/>

diff --git a/config/radio/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/V1_0/func_fuzzer/AndroidTest.xml
index f19ad5c..21ca181 100644
--- a/config/radio/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.0"/>

diff --git a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
index 4770a9b..cbc3da2 100644
--- a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.0"/>

diff --git a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
index 4ff2611..b3536af 100644
--- a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.1"/>

diff --git a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
index 3eeeb3e..6296ee4 100644
--- a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioDeprecatedV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio.deprecated@1.0"/>

diff --git a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
index f25cff0..48c99ec 100644
--- a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioDeprecatedV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio.deprecated@1.0"/>

diff --git a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
index 2692bc9..122e7e0 100644
--- a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRenderscriptV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.renderscript@1.0"/>

diff --git a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
index 4f2b850..ce464b2 100644
--- a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRenderscriptV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.renderscript@1.0"/>

diff --git a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml b/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
index b851d54..b0315a6 100644
--- a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSensorsV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.sensors@1.0"/>

diff --git a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
index 1aa7601..e52fd81 100644
--- a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSensorsV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.sensors@1.0"/>

diff --git a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
index f29cb43..dfd12aa 100644
--- a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSoundtriggerV2_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.0"/>

diff --git a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
index 7ea8df8..c826fc6 100644
--- a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSoundtriggerV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.0"/>

diff --git a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
index 5119acd..f34d391 100644
--- a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTetheroffloadConfigV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tetheroffload.config@1.0"/>

diff --git a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
index c3f44b4..56e6a6e 100644
--- a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTetheroffloadControlV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tetheroffload.control@1.0"/>

diff --git a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml b/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
index dfb25fe..6ecd851 100644
--- a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalThermalV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.thermal@1.0"/>

diff --git a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
index 8286a7b..0631cc3 100644
--- a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalThermalV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.thermal@1.0"/>

diff --git a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
index 30bad03..315c2fc 100644
--- a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalThermalV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.thermal@1.1"/>

diff --git a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
index b7bdddb..f1a8d65 100644
--- a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvCecV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.cec@1.0"/>

diff --git a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
index 419f852..37d02f2 100644
--- a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvCecV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.cec@1.0"/>

diff --git a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
index d2b162c..36cfaa3 100644
--- a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvInputV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.input@1.0"/>

diff --git a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
index f54aa4d..5c5ace7 100644
--- a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvInputV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.input@1.0"/>

diff --git a/config/usb/V1_0/func_fuzzer/AndroidTest.xml b/config/usb/V1_0/func_fuzzer/AndroidTest.xml
index 15c52e1..748aece 100644
--- a/config/usb/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalUsbV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>

diff --git a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
index 99a61ea..514780c 100644
--- a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalUsbV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>

diff --git a/config/usb/V1_1/iface_fuzzer/AndroidTest.xml b/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
index af51ee9..5f0415b 100644
--- a/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalUsbV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.usb@1.1"/>

diff --git a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
index 643de88..cbbecfc 100644
--- a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVibratorV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0"/>

diff --git a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
index 8b03cf7..6ebfcc0 100644
--- a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVibratorV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0"/>

diff --git a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
index e195698..7ba73b0 100644
--- a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVibratorV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.1"/>

diff --git a/config/vr/V1_0/func_fuzzer/AndroidTest.xml b/config/vr/V1_0/func_fuzzer/AndroidTest.xml
index 2477cb1..df83480 100644
--- a/config/vr/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVrV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>

diff --git a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
index 5148d35..4dacf61 100644
--- a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVrV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>

diff --git a/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml b/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
index 834d58f..63c60cd 100644
--- a/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWeaverV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.weaver@1.0"/>

diff --git a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
index 47286e9..4d04eee 100644
--- a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi@1.0"/>

diff --git a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
index b83f7b9..9065b01 100644
--- a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi@1.0"/>

diff --git a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
index 7343fd5..f3dbee3 100644
--- a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi@1.1"/>

diff --git a/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
index e8dbafb..6749570 100644
--- a/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiOffloadV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi.offload@1.0"/>

diff --git a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
index 7daf017..997eec2 100644
--- a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiSupplicantV1_0FuncFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.0"/>

diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
index 337d7e7..36299d4 100644
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiSupplicantV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.0"/>

diff --git a/script/config/template/template.xml b/script/config/template/template.xml
index 3daad00..31fe73e 100644
--- a/script/config/template/template.xml
+++ b/script/config/template/template.xml

@@ -6,7 +6,7 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="{TEST_TYPE_CAMEL}Test.push"/>
     </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="{TEST_NAME}"/>
         <option name="hal-hidl-package-name" value="android.hardware.{HAL_NAME}@{HAL_VERSION}"/>
commit	9b760c2024378d200424e82be908e884d8db36c0	[log] [tgz]
author	android-build-team Robot <android-build-team-robot@google.com>	Sun Dec 24 08:31:37 2017 +0000
committer	android-build-team Robot <android-build-team-robot@google.com>	Sun Dec 24 08:31:37 2017 +0000
tree	0889077a52ba8b6047198e2508f80c8cae715ec9
parent	e08e5cf1a5dd65c2029dfa2842cd5685448b3f2b [diff]
parent	54515db67530b759f10a0edb53e6bbadc954f6e7 [diff]