Skip ab/6749736 in stage.

Merged-In: I7435ae0d248f39161141745a55dfd36ea0112b02
Change-Id: Ib69cffe055d61f9dba6cb0b92c292c72810dd8ba
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index efaec38..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) 2016 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-subdirs = [
-    "iface_fuzzer",
-]
diff --git a/OWNERS b/OWNERS
index de4c089..e3caa69 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,4 @@
-yim@google.com
 guangzhu@google.com
+smoreland@google.com
+trong@google.com
+zhaomingyin@google.com
diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/__init__.py
+++ /dev/null
diff --git a/config/audio/V2_0/iface_fuzzer/Android.bp b/config/audio/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 831f4aa..0000000
--- a/config/audio/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAudioV2_0IfaceFuzzer",
-}
diff --git a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 55131af..0000000
--- a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAudioV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/audio/V4_0/iface_fuzzer/Android.bp b/config/audio/V4_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 2d24c2b..0000000
--- a/config/audio/V4_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAudioV4_0IfaceFuzzer",
-}
diff --git a/config/audio/V4_0/iface_fuzzer/AndroidTest.xml b/config/audio/V4_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 7163098..0000000
--- a/config/audio/V4_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAudioV4_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalAudioV4_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.audio@4.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/audio/common/V2_0/iface_fuzzer/Android.bp b/config/audio/common/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 7758a94..0000000
--- a/config/audio/common/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAudioCommonV2_0IfaceFuzzer",
-}
diff --git a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 655d2a1..0000000
--- a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAudioCommonV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/audio/common/V4_0/iface_fuzzer/Android.bp b/config/audio/common/V4_0/iface_fuzzer/Android.bp
deleted file mode 100644
index fb4e2f8..0000000
--- a/config/audio/common/V4_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAudioCommonV4_0IfaceFuzzer",
-}
diff --git a/config/audio/common/V4_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V4_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index aa9f697..0000000
--- a/config/audio/common/V4_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAudioCommonV4_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalAudioCommonV4_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.audio.common@4.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/audio/effect/V2_0/iface_fuzzer/Android.bp b/config/audio/effect/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 6d13867..0000000
--- a/config/audio/effect/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAudioEffectV2_0IfaceFuzzer",
-}
diff --git a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 74982d0..0000000
--- a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAudioEffectV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/audio/effect/V4_0/iface_fuzzer/Android.bp b/config/audio/effect/V4_0/iface_fuzzer/Android.bp
deleted file mode 100644
index daf353b..0000000
--- a/config/audio/effect/V4_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAudioEffectV4_0IfaceFuzzer",
-}
diff --git a/config/audio/effect/V4_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V4_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 03bba80..0000000
--- a/config/audio/effect/V4_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAudioEffectV4_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalAudioEffectV4_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.audio.effect@4.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/authsecret/V1_0/iface_fuzzer/Android.bp b/config/authsecret/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 5108cb9..0000000
--- a/config/authsecret/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAuthsecretV1_0IfaceFuzzer",
-}
diff --git a/config/authsecret/V1_0/iface_fuzzer/AndroidTest.xml b/config/authsecret/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 364bcd2..0000000
--- a/config/authsecret/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAuthsecretV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalAuthsecretV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.authsecret@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.bp b/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 10a369b..0000000
--- a/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAutomotiveAudiocontrolV1_0IfaceFuzzer",
-}
diff --git a/config/automotive/audiocontrol/V1_0/iface_fuzzer/AndroidTest.xml b/config/automotive/audiocontrol/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 100f2fe..0000000
--- a/config/automotive/audiocontrol/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAutomotiveAudiocontrolV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalAutomotiveAudiocontrolV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.automotive.audiocontrol@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/automotive/evs/V1_0/iface_fuzzer/Android.bp b/config/automotive/evs/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 862bd2a..0000000
--- a/config/automotive/evs/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAutomotiveEvsV1_0IfaceFuzzer",
-}
diff --git a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ab8dde8..0000000
--- a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAutomotiveEvsV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/Android.bp b/config/automotive/vehicle/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 6ae09f4..0000000
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalAutomotiveVehicleV2_0IfaceFuzzer",
-}
diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 262575e..0000000
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalAutomotiveVehicleV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.bp b/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 82b151a..0000000
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalBiometricsFingerprintV2_1IfaceFuzzer",
-}
diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ab3215c..0000000
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalBiometricsFingerprintV2_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/bluetooth/V1_0/iface_fuzzer/Android.bp b/config/bluetooth/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 3c8014d..0000000
--- a/config/bluetooth/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalBluetoothV1_0IfaceFuzzer",
-}
diff --git a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 21f626c..0000000
--- a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalBluetoothV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/bluetooth/a2dp/V1_0/iface_fuzzer/Android.mk~HEAD b/config/bluetooth/a2dp/V1_0/iface_fuzzer/Android.mk~HEAD
deleted file mode 100644
index fd856f6..0000000
--- a/config/bluetooth/a2dp/V1_0/iface_fuzzer/Android.mk~HEAD
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalBluetoothA2DpV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml~HEAD b/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml~HEAD
deleted file mode 100644
index 5172d50..0000000
--- a/config/bluetooth/a2dp/V1_0/iface_fuzzer/AndroidTest.xml~HEAD
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalBluetoothA2DpV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalBluetoothA2DpV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.bluetooth.a2dp@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/boot/V1_0/iface_fuzzer/Android.bp b/config/boot/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index c578611..0000000
--- a/config/boot/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalBootV1_0IfaceFuzzer",
-}
diff --git a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 3eda116..0000000
--- a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalBootV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/broadcastradio/V1_0/iface_fuzzer/Android.bp b/config/broadcastradio/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index ff785eb..0000000
--- a/config/broadcastradio/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalBroadcastradioV1_0IfaceFuzzer",
-}
diff --git a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 9b913ee..0000000
--- a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalBroadcastradioV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/broadcastradio/V1_1/iface_fuzzer/Android.bp b/config/broadcastradio/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 1d64911..0000000
--- a/config/broadcastradio/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalBroadcastradioV1_1IfaceFuzzer",
-}
diff --git a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index d84ab51..0000000
--- a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalBroadcastradioV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/broadcastradio/V2_0/iface_fuzzer/Android.bp b/config/broadcastradio/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 6fdd54a..0000000
--- a/config/broadcastradio/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalBroadcastradioV2_0IfaceFuzzer",
-}
diff --git a/config/broadcastradio/V2_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 811b31b..0000000
--- a/config/broadcastradio/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalBroadcastradioV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalBroadcastradioV2_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@2.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/common/V1_0/iface_fuzzer/Android.bp b/config/camera/common/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index c16f41c..0000000
--- a/config/camera/common/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraCommonV1_0IfaceFuzzer",
-}
diff --git a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index d6fdbae..0000000
--- a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraCommonV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/device/V1_0/iface_fuzzer/Android.bp b/config/camera/device/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index bf3d927..0000000
--- a/config/camera/device/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraDeviceV1_0IfaceFuzzer",
-}
diff --git a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ce15443..0000000
--- a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraDeviceV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/device/V3_2/iface_fuzzer/Android.bp b/config/camera/device/V3_2/iface_fuzzer/Android.bp
deleted file mode 100644
index 396fade..0000000
--- a/config/camera/device/V3_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraDeviceV3_2IfaceFuzzer",
-}
diff --git a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index a4533d2..0000000
--- a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraDeviceV3_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/device/V3_3/iface_fuzzer/Android.bp b/config/camera/device/V3_3/iface_fuzzer/Android.bp
deleted file mode 100644
index 04f3a43..0000000
--- a/config/camera/device/V3_3/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraDeviceV3_3IfaceFuzzer",
-}
diff --git a/config/camera/device/V3_3/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_3/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 0a8bd74..0000000
--- a/config/camera/device/V3_3/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraDeviceV3_3IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalCameraDeviceV3_3IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.3"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/device/V3_4/iface_fuzzer/Android.bp b/config/camera/device/V3_4/iface_fuzzer/Android.bp
deleted file mode 100644
index 7ed0cc1..0000000
--- a/config/camera/device/V3_4/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraDeviceV3_4IfaceFuzzer",
-}
diff --git a/config/camera/device/V3_4/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_4/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index cc16229..0000000
--- a/config/camera/device/V3_4/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraDeviceV3_4IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalCameraDeviceV3_4IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.4"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/metadata/V3_2/iface_fuzzer/Android.bp b/config/camera/metadata/V3_2/iface_fuzzer/Android.bp
deleted file mode 100644
index 04c9f26..0000000
--- a/config/camera/metadata/V3_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraMetadataV3_2IfaceFuzzer",
-}
diff --git a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 03f32d7..0000000
--- a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraMetadataV3_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/metadata/V3_3/iface_fuzzer/Android.bp b/config/camera/metadata/V3_3/iface_fuzzer/Android.bp
deleted file mode 100644
index 514f6e1..0000000
--- a/config/camera/metadata/V3_3/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraMetadataV3_3IfaceFuzzer",
-}
diff --git a/config/camera/metadata/V3_3/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_3/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ca91e1d..0000000
--- a/config/camera/metadata/V3_3/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraMetadataV3_3IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalCameraMetadataV3_3IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.3"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/camera/provider/V2_4/iface_fuzzer/Android.bp b/config/camera/provider/V2_4/iface_fuzzer/Android.bp
deleted file mode 100644
index cf2fb63..0000000
--- a/config/camera/provider/V2_4/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCameraProviderV2_4IfaceFuzzer",
-}
diff --git a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index b066061..0000000
--- a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCameraProviderV2_4IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/cas/V1_0/iface_fuzzer/Android.bp b/config/cas/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 3fe2517..0000000
--- a/config/cas/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCasV1_0IfaceFuzzer",
-}
diff --git a/config/cas/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 49d3161..0000000
--- a/config/cas/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCasV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/cas/native/V1_0/iface_fuzzer/Android.bp b/config/cas/native/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 9143c86..0000000
--- a/config/cas/native/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalCasNativeV1_0IfaceFuzzer",
-}
diff --git a/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml b/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index e3c66a8..0000000
--- a/config/cas/native/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalCasNativeV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/configstore/V1_0/iface_fuzzer/Android.bp b/config/configstore/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index ce25686..0000000
--- a/config/configstore/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalConfigstoreV1_0IfaceFuzzer",
-}
diff --git a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 5070bd5..0000000
--- a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalConfigstoreV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/configstore/V1_1/iface_fuzzer/Android.bp b/config/configstore/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 8fa5f0b..0000000
--- a/config/configstore/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalConfigstoreV1_1IfaceFuzzer",
-}
diff --git a/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 91c89ab..0000000
--- a/config/configstore/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalConfigstoreV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/confirmationui/V1_0/iface_fuzzer/Android.bp b/config/confirmationui/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index ede92ff..0000000
--- a/config/confirmationui/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalConfirmationuiV1_0IfaceFuzzer",
-}
diff --git a/config/confirmationui/V1_0/iface_fuzzer/AndroidTest.xml b/config/confirmationui/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index f3097b1..0000000
--- a/config/confirmationui/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalConfirmationuiV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalConfirmationuiV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.confirmationui@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/contexthub/V1_0/iface_fuzzer/Android.bp b/config/contexthub/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index bc2185e..0000000
--- a/config/contexthub/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalContexthubV1_0IfaceFuzzer",
-}
diff --git a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 6e75f9a..0000000
--- a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalContexthubV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/drm/V1_0/iface_fuzzer/Android.bp b/config/drm/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 849f247..0000000
--- a/config/drm/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalDrmV1_0IfaceFuzzer",
-}
diff --git a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index bad0f40..0000000
--- a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalDrmV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/drm/V1_1/iface_fuzzer/Android.bp b/config/drm/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 711c0d0..0000000
--- a/config/drm/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalDrmV1_1IfaceFuzzer",
-}
diff --git a/config/drm/V1_1/iface_fuzzer/AndroidTest.xml b/config/drm/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index f5a82be..0000000
--- a/config/drm/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalDrmV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalDrmV1_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.drm@1.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/drm/V1_2/iface_fuzzer/Android.bp b/config/drm/V1_2/iface_fuzzer/Android.bp
deleted file mode 100644
index d857e4e..0000000
--- a/config/drm/V1_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalDrmV1_2IfaceFuzzer",
-}
diff --git a/config/drm/V1_2/iface_fuzzer/AndroidTest.xml b/config/drm/V1_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 9bac772..0000000
--- a/config/drm/V1_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalDrmV1_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalDrmV1_2IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.drm@1.2"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/drm/V1_3/iface_fuzzer/Android.bp b/config/drm/V1_3/iface_fuzzer/Android.bp
deleted file mode 100644
index 57c4879..0000000
--- a/config/drm/V1_3/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalDrmV1_3IfaceFuzzer",
-}
diff --git a/config/drm/V1_3/iface_fuzzer/AndroidTest.xml b/config/drm/V1_3/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 7d879f6..0000000
--- a/config/drm/V1_3/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalDrmV1_3IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalDrmV1_3IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.drm@1.3"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/dumpstate/V1_0/iface_fuzzer/Android.bp b/config/dumpstate/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index b99fc65..0000000
--- a/config/dumpstate/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalDumpstateV1_0IfaceFuzzer",
-}
diff --git a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index f709641..0000000
--- a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalDumpstateV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/gatekeeper/V1_0/iface_fuzzer/Android.bp b/config/gatekeeper/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 4c71668..0000000
--- a/config/gatekeeper/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGatekeeperV1_0IfaceFuzzer",
-}
diff --git a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 52981ae..0000000
--- a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGatekeeperV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/gnss/V1_0/iface_fuzzer/Android.bp b/config/gnss/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 437982c..0000000
--- a/config/gnss/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGnssV1_0IfaceFuzzer",
-}
diff --git a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ce57486..0000000
--- a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGnssV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/gnss/V1_1/iface_fuzzer/Android.bp b/config/gnss/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index f64b147..0000000
--- a/config/gnss/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGnssV1_1IfaceFuzzer",
-}
diff --git a/config/gnss/V1_1/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 3690fec..0000000
--- a/config/gnss/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGnssV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalGnssV1_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.gnss@1.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/Android.bp b/config/graphics/allocator/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 52baef8..0000000
--- a/config/graphics/allocator/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsAllocatorV2_0IfaceFuzzer",
-}
diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index e2a0221..0000000
--- a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsAllocatorV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.bp b/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index cac88b1..0000000
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsBufferqueueV1_0IfaceFuzzer",
-}
diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 2a15f05..0000000
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsBufferqueueV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/common/V1_0/iface_fuzzer/Android.bp b/config/graphics/common/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 3aa282b..0000000
--- a/config/graphics/common/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsCommonV1_0IfaceFuzzer",
-}
diff --git a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 15cf5d1..0000000
--- a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsCommonV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/common/V1_1/iface_fuzzer/Android.bp b/config/graphics/common/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 174b90a..0000000
--- a/config/graphics/common/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsCommonV1_1IfaceFuzzer",
-}
diff --git a/config/graphics/common/V1_1/iface_fuzzer/AndroidTest.xml b/config/graphics/common/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 16b8363..0000000
--- a/config/graphics/common/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsCommonV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalGraphicsCommonV1_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/composer/V2_1/iface_fuzzer/Android.bp b/config/graphics/composer/V2_1/iface_fuzzer/Android.bp
deleted file mode 100644
index eee7b6f..0000000
--- a/config/graphics/composer/V2_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsComposerV2_1IfaceFuzzer",
-}
diff --git a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 4aa2926..0000000
--- a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsComposerV2_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/composer/V2_2/iface_fuzzer/Android.bp b/config/graphics/composer/V2_2/iface_fuzzer/Android.bp
deleted file mode 100644
index c16d5d0..0000000
--- a/config/graphics/composer/V2_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsComposerV2_2IfaceFuzzer",
-}
diff --git a/config/graphics/composer/V2_2/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 713f3a2..0000000
--- a/config/graphics/composer/V2_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsComposerV2_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalGraphicsComposerV2_2IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.2"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/Android.bp b/config/graphics/mapper/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 160967e..0000000
--- a/config/graphics/mapper/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsMapperV2_0IfaceFuzzer",
-}
diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 27a3533..0000000
--- a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsMapperV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/graphics/mapper/V2_1/iface_fuzzer/Android.bp b/config/graphics/mapper/V2_1/iface_fuzzer/Android.bp
deleted file mode 100644
index c9ca732..0000000
--- a/config/graphics/mapper/V2_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalGraphicsMapperV2_1IfaceFuzzer",
-}
diff --git a/config/graphics/mapper/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index e515199..0000000
--- a/config/graphics/mapper/V2_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalGraphicsMapperV2_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalGraphicsMapperV2_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/health/V1_0/iface_fuzzer/Android.bp b/config/health/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 03be02a..0000000
--- a/config/health/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalHealthV1_0IfaceFuzzer",
-}
diff --git a/config/health/V1_0/iface_fuzzer/AndroidTest.xml b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 98daddf..0000000
--- a/config/health/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalHealthV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/health/V2_0/iface_fuzzer/Android.bp b/config/health/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 5e89714..0000000
--- a/config/health/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalHealthV2_0IfaceFuzzer",
-}
diff --git a/config/health/V2_0/iface_fuzzer/AndroidTest.xml b/config/health/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 291f122..0000000
--- a/config/health/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalHealthV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalHealthV2_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.health@2.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/ir/V1_0/iface_fuzzer/Android.bp b/config/ir/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index d6142f8..0000000
--- a/config/ir/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalIrV1_0IfaceFuzzer",
-}
diff --git a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 9599b21..0000000
--- a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalIrV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/keymaster/V3_0/iface_fuzzer/Android.bp b/config/keymaster/V3_0/iface_fuzzer/Android.bp
deleted file mode 100644
index d77bf49..0000000
--- a/config/keymaster/V3_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalKeymasterV3_0IfaceFuzzer",
-}
diff --git a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 2484e9e..0000000
--- a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalKeymasterV3_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/keymaster/V4_0/iface_fuzzer/Android.bp b/config/keymaster/V4_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 51b5219..0000000
--- a/config/keymaster/V4_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalKeymasterV4_0IfaceFuzzer",
-}
diff --git a/config/keymaster/V4_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V4_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index a86cc9f..0000000
--- a/config/keymaster/V4_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalKeymasterV4_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalKeymasterV4_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.keymaster@4.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/light/V2_0/iface_fuzzer/Android.bp b/config/light/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 755b0f8..0000000
--- a/config/light/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalLightV2_0IfaceFuzzer",
-}
diff --git a/config/light/V2_0/iface_fuzzer/AndroidTest.xml b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 21d1fcc..0000000
--- a/config/light/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalLightV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/media/V1_0/iface_fuzzer/Android.bp b/config/media/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index dece316..0000000
--- a/config/media/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalMediaV1_0IfaceFuzzer",
-}
diff --git a/config/media/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 2ccacd1..0000000
--- a/config/media/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalMediaV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/media/bufferpool/V1_0/iface_fuzzer/Android.bp b/config/media/bufferpool/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index b06d43b..0000000
--- a/config/media/bufferpool/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalMediaBufferpoolV1_0IfaceFuzzer",
-}
diff --git a/config/media/bufferpool/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/bufferpool/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 5b416d5..0000000
--- a/config/media/bufferpool/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalMediaBufferpoolV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalMediaBufferpoolV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.media.bufferpool@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/media/omx/V1_0/iface_fuzzer/Android.bp b/config/media/omx/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 731beb6..0000000
--- a/config/media/omx/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalMediaOmxV1_0IfaceFuzzer",
-}
diff --git a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index f13befc..0000000
--- a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalMediaOmxV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/memtrack/V1_0/iface_fuzzer/Android.bp b/config/memtrack/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 232ce80..0000000
--- a/config/memtrack/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalMemtrackV1_0IfaceFuzzer",
-}
diff --git a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 3423d0f..0000000
--- a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalMemtrackV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/neuralnetworks/V1_0/iface_fuzzer/Android.bp b/config/neuralnetworks/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 5e3e5d5..0000000
--- a/config/neuralnetworks/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalNeuralnetworksV1_0IfaceFuzzer",
-}
diff --git a/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml b/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 6f3fd6a..0000000
--- a/config/neuralnetworks/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalNeuralnetworksV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/neuralnetworks/V1_1/iface_fuzzer/Android.bp b/config/neuralnetworks/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 17f58f8..0000000
--- a/config/neuralnetworks/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalNeuralnetworksV1_1IfaceFuzzer",
-}
diff --git a/config/neuralnetworks/V1_1/iface_fuzzer/AndroidTest.xml b/config/neuralnetworks/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 11a73c5..0000000
--- a/config/neuralnetworks/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalNeuralnetworksV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalNeuralnetworksV1_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.neuralnetworks@1.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/neuralnetworks/V1_2/iface_fuzzer/Android.bp b/config/neuralnetworks/V1_2/iface_fuzzer/Android.bp
deleted file mode 100644
index 12c472a..0000000
--- a/config/neuralnetworks/V1_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalNeuralnetworksV1_2IfaceFuzzer",
-}
diff --git a/config/neuralnetworks/V1_2/iface_fuzzer/AndroidTest.xml b/config/neuralnetworks/V1_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index abf5a88..0000000
--- a/config/neuralnetworks/V1_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalNeuralnetworksV1_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalNeuralnetworksV1_2IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.neuralnetworks@1.2"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/nfc/V1_0/iface_fuzzer/Android.bp b/config/nfc/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 1b39d5a..0000000
--- a/config/nfc/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalNfcV1_0IfaceFuzzer",
-}
diff --git a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 9f51098..0000000
--- a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalNfcV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/nfc/V1_1/iface_fuzzer/Android.bp b/config/nfc/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 5a92255..0000000
--- a/config/nfc/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalNfcV1_1IfaceFuzzer",
-}
diff --git a/config/nfc/V1_1/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 4708644..0000000
--- a/config/nfc/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalNfcV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalNfcV1_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.nfc@1.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/oemlock/V1_0/iface_fuzzer/Android.bp b/config/oemlock/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 81c1724..0000000
--- a/config/oemlock/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalOemlockV1_0IfaceFuzzer",
-}
diff --git a/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml b/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index f2b972a..0000000
--- a/config/oemlock/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalOemlockV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/power/V1_0/iface_fuzzer/Android.bp b/config/power/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 32d428b..0000000
--- a/config/power/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalPowerV1_0IfaceFuzzer",
-}
diff --git a/config/power/V1_0/iface_fuzzer/AndroidTest.xml b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 088ea7c..0000000
--- a/config/power/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalPowerV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/power/V1_1/iface_fuzzer/Android.bp b/config/power/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index b67534e..0000000
--- a/config/power/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalPowerV1_1IfaceFuzzer",
-}
diff --git a/config/power/V1_1/iface_fuzzer/AndroidTest.xml b/config/power/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index e0909c4..0000000
--- a/config/power/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalPowerV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/power/V1_2/iface_fuzzer/Android.bp b/config/power/V1_2/iface_fuzzer/Android.bp
deleted file mode 100644
index b7a6b4e..0000000
--- a/config/power/V1_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalPowerV1_2IfaceFuzzer",
-}
diff --git a/config/power/V1_2/iface_fuzzer/AndroidTest.xml b/config/power/V1_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 353624c..0000000
--- a/config/power/V1_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalPowerV1_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalPowerV1_2IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.power@1.2"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/radio/V1_0/iface_fuzzer/Android.bp b/config/radio/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 8343f59..0000000
--- a/config/radio/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalRadioV1_0IfaceFuzzer",
-}
diff --git a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ac012b7..0000000
--- a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalRadioV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/radio/V1_1/iface_fuzzer/Android.bp b/config/radio/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 5f0972f..0000000
--- a/config/radio/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalRadioV1_1IfaceFuzzer",
-}
diff --git a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index c00e785..0000000
--- a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalRadioV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/radio/V1_2/iface_fuzzer/Android.bp b/config/radio/V1_2/iface_fuzzer/Android.bp
deleted file mode 100644
index ab6ed08..0000000
--- a/config/radio/V1_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalRadioV1_2IfaceFuzzer",
-}
diff --git a/config/radio/V1_2/iface_fuzzer/AndroidTest.xml b/config/radio/V1_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 747ff61..0000000
--- a/config/radio/V1_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalRadioV1_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalRadioV1_2IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.radio@1.2"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/radio/config/V1_0/iface_fuzzer/Android.bp b/config/radio/config/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 3a0b370..0000000
--- a/config/radio/config/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalRadioConfigV1_0IfaceFuzzer",
-}
diff --git a/config/radio/config/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/config/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index f54b9fd..0000000
--- a/config/radio/config/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalRadioConfigV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalRadioConfigV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.radio.config@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/radio/deprecated/V1_0/iface_fuzzer/Android.bp b/config/radio/deprecated/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 471da2f..0000000
--- a/config/radio/deprecated/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalRadioDeprecatedV1_0IfaceFuzzer",
-}
diff --git a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 5388b37..0000000
--- a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalRadioDeprecatedV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/renderscript/V1_0/iface_fuzzer/Android.bp b/config/renderscript/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 31ba63d..0000000
--- a/config/renderscript/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalRenderscriptV1_0IfaceFuzzer",
-}
diff --git a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 839ad30..0000000
--- a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalRenderscriptV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/secure_element/V1_0/iface_fuzzer/Android.bp b/config/secure_element/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index bc7d3b4..0000000
--- a/config/secure_element/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalSecure_ElementV1_0IfaceFuzzer",
-}
diff --git a/config/secure_element/V1_0/iface_fuzzer/AndroidTest.xml b/config/secure_element/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 14d5a91..0000000
--- a/config/secure_element/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalSecure_ElementV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalSecure_ElementV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.secure_element@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/sensors/V1_0/iface_fuzzer/Android.bp b/config/sensors/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 57e18cb..0000000
--- a/config/sensors/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalSensorsV1_0IfaceFuzzer",
-}
diff --git a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 856c3f1..0000000
--- a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalSensorsV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/soundtrigger/V2_0/iface_fuzzer/Android.bp b/config/soundtrigger/V2_0/iface_fuzzer/Android.bp
deleted file mode 100644
index a210773..0000000
--- a/config/soundtrigger/V2_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalSoundtriggerV2_0IfaceFuzzer",
-}
diff --git a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 7b7df89..0000000
--- a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalSoundtriggerV2_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/soundtrigger/V2_1/iface_fuzzer/Android.bp b/config/soundtrigger/V2_1/iface_fuzzer/Android.bp
deleted file mode 100644
index b4ae866..0000000
--- a/config/soundtrigger/V2_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalSoundtriggerV2_1IfaceFuzzer",
-}
diff --git a/config/soundtrigger/V2_1/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 84f3521..0000000
--- a/config/soundtrigger/V2_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalSoundtriggerV2_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalSoundtriggerV2_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/tetheroffload/config/V1_0/iface_fuzzer/Android.bp b/config/tetheroffload/config/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 99c23b1..0000000
--- a/config/tetheroffload/config/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalTetheroffloadConfigV1_0IfaceFuzzer",
-}
diff --git a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 325ebdd..0000000
--- a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalTetheroffloadConfigV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/tetheroffload/control/V1_0/iface_fuzzer/Android.bp b/config/tetheroffload/control/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index bdb2f86..0000000
--- a/config/tetheroffload/control/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalTetheroffloadControlV1_0IfaceFuzzer",
-}
diff --git a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 0e8c2b8..0000000
--- a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalTetheroffloadControlV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/thermal/V1_0/iface_fuzzer/Android.bp b/config/thermal/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 1f68971..0000000
--- a/config/thermal/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalThermalV1_0IfaceFuzzer",
-}
diff --git a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 8476ad5..0000000
--- a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalThermalV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/thermal/V1_1/iface_fuzzer/Android.bp b/config/thermal/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 921de80..0000000
--- a/config/thermal/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalThermalV1_1IfaceFuzzer",
-}
diff --git a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index e7ea0f8..0000000
--- a/config/thermal/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalThermalV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/tv/cec/V1_0/iface_fuzzer/Android.bp b/config/tv/cec/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 1874a26..0000000
--- a/config/tv/cec/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalTvCecV1_0IfaceFuzzer",
-}
diff --git a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index bd57c1d..0000000
--- a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalTvCecV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/tv/input/V1_0/iface_fuzzer/Android.bp b/config/tv/input/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index ae0ca2c..0000000
--- a/config/tv/input/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalTvInputV1_0IfaceFuzzer",
-}
diff --git a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index dfe4618..0000000
--- a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalTvInputV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/usb/V1_0/iface_fuzzer/Android.bp b/config/usb/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index cdbc8af..0000000
--- a/config/usb/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalUsbV1_0IfaceFuzzer",
-}
diff --git a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 24badf4..0000000
--- a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalUsbV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/usb/V1_1/iface_fuzzer/Android.bp b/config/usb/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 12b345c..0000000
--- a/config/usb/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalUsbV1_1IfaceFuzzer",
-}
diff --git a/config/usb/V1_1/iface_fuzzer/AndroidTest.xml b/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 071893d..0000000
--- a/config/usb/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalUsbV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/usb/gadget/V1_0/iface_fuzzer/Android.bp b/config/usb/gadget/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 1f8749d..0000000
--- a/config/usb/gadget/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalUsbGadgetV1_0IfaceFuzzer",
-}
diff --git a/config/usb/gadget/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/gadget/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index b600e84..0000000
--- a/config/usb/gadget/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalUsbGadgetV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalUsbGadgetV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.usb.gadget@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/vibrator/V1_0/iface_fuzzer/Android.bp b/config/vibrator/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 1144a4f..0000000
--- a/config/vibrator/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalVibratorV1_0IfaceFuzzer",
-}
diff --git a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 470742c..0000000
--- a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalVibratorV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/vibrator/V1_1/iface_fuzzer/Android.bp b/config/vibrator/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index a07eee7..0000000
--- a/config/vibrator/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalVibratorV1_1IfaceFuzzer",
-}
diff --git a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index b745be0..0000000
--- a/config/vibrator/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalVibratorV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/vibrator/V1_2/iface_fuzzer/Android.bp b/config/vibrator/V1_2/iface_fuzzer/Android.bp
deleted file mode 100644
index 71e8988..0000000
--- a/config/vibrator/V1_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalVibratorV1_2IfaceFuzzer",
-}
diff --git a/config/vibrator/V1_2/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 1aeddf5..0000000
--- a/config/vibrator/V1_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalVibratorV1_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalVibratorV1_2IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.2"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/vr/V1_0/iface_fuzzer/Android.bp b/config/vr/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 13a9fde..0000000
--- a/config/vr/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalVrV1_0IfaceFuzzer",
-}
diff --git a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 9b3e649..0000000
--- a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalVrV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/weaver/V1_0/iface_fuzzer/Android.bp b/config/weaver/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 2e8f7c0..0000000
--- a/config/weaver/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWeaverV1_0IfaceFuzzer",
-}
diff --git a/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml b/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 884d85b..0000000
--- a/config/weaver/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWeaverV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/wifi/V1_0/iface_fuzzer/Android.bp b/config/wifi/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 0768d64..0000000
--- a/config/wifi/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWifiV1_0IfaceFuzzer",
-}
diff --git a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ba2efc8..0000000
--- a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/wifi/V1_1/iface_fuzzer/Android.bp b/config/wifi/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index 4a95412..0000000
--- a/config/wifi/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWifiV1_1IfaceFuzzer",
-}
diff --git a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 020f68e..0000000
--- a/config/wifi/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/wifi/V1_2/iface_fuzzer/Android.bp b/config/wifi/V1_2/iface_fuzzer/Android.bp
deleted file mode 100644
index 8a1a70b..0000000
--- a/config/wifi/V1_2/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWifiV1_2IfaceFuzzer",
-}
diff --git a/config/wifi/V1_2/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_2/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index e54f774..0000000
--- a/config/wifi/V1_2/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiV1_2IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalWifiV1_2IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.wifi@1.2"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/wifi/hostapd/V1_0/iface_fuzzer/Android.bp b/config/wifi/hostapd/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index 2bee920..0000000
--- a/config/wifi/hostapd/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWifiHostapdV1_0IfaceFuzzer",
-}
diff --git a/config/wifi/hostapd/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/hostapd/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 91185eb..0000000
--- a/config/wifi/hostapd/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiHostapdV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalWifiHostapdV1_0IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.wifi.hostapd@1.0"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/wifi/offload/V1_0/iface_fuzzer/Android.bp b/config/wifi/offload/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index ea27ead..0000000
--- a/config/wifi/offload/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWifiOffloadV1_0IfaceFuzzer",
-}
diff --git a/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index c684a48..0000000
--- a/config/wifi/offload/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiOffloadV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/Android.bp b/config/wifi/supplicant/V1_0/iface_fuzzer/Android.bp
deleted file mode 100644
index d9da865..0000000
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWifiSupplicantV1_0IfaceFuzzer",
-}
diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index 1a05b63..0000000
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiSupplicantV1_0IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <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"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/config/wifi/supplicant/V1_1/iface_fuzzer/Android.bp b/config/wifi/supplicant/V1_1/iface_fuzzer/Android.bp
deleted file mode 100644
index b0fcd8c..0000000
--- a/config/wifi/supplicant/V1_1/iface_fuzzer/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "VtsHalWifiSupplicantV1_1IfaceFuzzer",
-}
diff --git a/config/wifi/supplicant/V1_1/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_1/iface_fuzzer/AndroidTest.xml
deleted file mode 100644
index ab57785..0000000
--- a/config/wifi/supplicant/V1_1/iface_fuzzer/AndroidTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for VtsHalWifiSupplicantV1_1IfaceFuzzer test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="IfaceFuzzerTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalWifiSupplicantV1_1IfaceFuzzer"/>
-        <option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.1"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/iface_fuzzer_test/iface_fuzzer_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/iface_fuzzer/OWNERS b/iface_fuzzer/OWNERS
deleted file mode 100644
index e06b66c..0000000
--- a/iface_fuzzer/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-smoreland@google.com
-trong@google.com
-zhaomingyin@google.com
diff --git a/kernel/OWNERS b/kernel/OWNERS
deleted file mode 100644
index 01bcfad..0000000
--- a/kernel/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-jiwonshin@google.com
-yim@google.com
-yuexima@google.com
diff --git a/kernel/__init__.py b/kernel/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/kernel/__init__.py
+++ /dev/null
diff --git a/kernel/syzkaller/Android.bp b/kernel/syzkaller/Android.bp
deleted file mode 100644
index d8af068..0000000
--- a/kernel/syzkaller/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-vts_config {
-    name: "VtsKernelFuzzTest",
-}
diff --git a/kernel/syzkaller/AndroidTest.xml b/kernel/syzkaller/AndroidTest.xml
deleted file mode 100644
index 3863ab6..0000000
--- a/kernel/syzkaller/AndroidTest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS Fuzz-Kernel test case">
-    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz-kernel" />
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsKernelFuzzTest"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/kernel/syzkaller/syzkaller_test" />
-    </test>
-</configuration>
diff --git a/kernel/syzkaller/__init__.py b/kernel/syzkaller/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/kernel/syzkaller/__init__.py
+++ /dev/null
diff --git a/kernel/syzkaller/environment_variables.py b/kernel/syzkaller/environment_variables.py
deleted file mode 100644
index 3cd57a4..0000000
--- a/kernel/syzkaller/environment_variables.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-syzkaller_dir = 'syzkaller'  # tmp/tmp8214/syzkaller
-syzkaller_bin_dir = 'syzkaller/bin'  # tmp/tmp8214/syzkaller/bin
-syzkaller_work_dir = 'syzkaller_work'  # tmp/tmp8214/syzkaller_work
-template_cfg = 'syzkaller_template.cfg'  # tmp/tmp8214/syzkaller_template.cfg
diff --git a/kernel/syzkaller/syzkaller_test.py b/kernel/syzkaller/syzkaller_test.py
deleted file mode 100644
index d951592..0000000
--- a/kernel/syzkaller/syzkaller_test.py
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import logging
-import os
-import shutil
-import tempfile
-
-import environment_variables as env
-import syzkaller_test_case
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test
-from vts.runners.host import config_parser
-from vts.runners.host import keys
-from vts.runners.host import test_runner
-from vts.utils.python.common import cmd_utils
-from vts.utils.python.controllers import adb
-from vts.utils.python.controllers import android_device
-from vts.utils.python.gcs import gcs_api_utils
-
-
-class SyzkallerTest(base_test.BaseTestClass):
-    """Runs Syzkaller tests on target."""
-
-    start_vts_agents = False
-
-    def setUpClass(self):
-        """Creates a remote shell instance, and copies data files.
-
-        Attributes:
-            _env: dict, a mapping from key to environment path of this test.
-            _gcs_api_utils: a GcsApiUtils object used for uploading logs.
-            _dut: an android device controller object used for getting device info.
-        """
-
-        required_params = [
-            keys.ConfigKeys.IKEY_SERVICE_JSON_PATH,
-            keys.ConfigKeys.IKEY_FUZZING_GCS_BUCKET_NAME,
-            keys.ConfigKeys.IKEY_SYZKALLER_PACKAGES_PATH,
-            keys.ConfigKeys.IKEY_SYZKALLER_TEMPLATE_PATH
-        ]
-        self.getUserParams(required_params)
-
-        _temp_dir = tempfile.mkdtemp()
-        self._env = dict()
-        self._env['temp_dir'] = _temp_dir
-        self._env['syzkaller_dir'] = os.path.join(_temp_dir, env.syzkaller_dir)
-        self._env['syzkaller_bin_dir'] = os.path.join(_temp_dir,
-                                                      env.syzkaller_bin_dir)
-        self._env['syzkaller_work_dir'] = os.path.join(_temp_dir,
-                                                       env.syzkaller_work_dir)
-        self._env['template_cfg'] = os.path.join(_temp_dir, env.template_cfg)
-
-        self._gcs_api_utils = gcs_api_utils.GcsApiUtils(
-            self.service_key_json_path, self.fuzzing_gcs_bucket_name)
-        self._dut = self.android_devices[0]
-
-    def FetchSyzkaller(self):
-        """Fetch Syzkaller program from x20 and make sure files are executable."""
-        try:
-            logging.info('Fetching Syzkaller program.')
-            shutil.copytree(self.syzkaller_packages_path,
-                            self._env['syzkaller_dir'])
-            logging.info('Fetching Syzkaller template configuration.')
-            shutil.copy(self.syzkaller_template_path, self._env['temp_dir'])
-        except IOError, e:
-            logging.exception(e)
-            self.skipAllTests(
-                'Syzkaller program is not available. Skipping all tests.')
-
-        for root, dirs, files in os.walk(self._env['syzkaller_bin_dir']):
-            for filepath in files:
-                os.chmod(os.path.join(root, filepath), 0755)
-
-    def CreateTestCases(self):
-        """Create syzkaller test cases.
-
-        Returns:
-            test_cases, list, the list of test_cases for this test.
-        """
-        test_cases = []
-        test_cases.append(
-            syzkaller_test_case.SyzkallerTestCase(self._env, 'linux/arm64',
-                                                  self._dut.serial, 'adb',
-                                                  'false', 12))
-        return test_cases
-
-    def RunTestCase(self, test_case):
-        """Run a syzkaller test case.
-
-        Args:
-            test_case: SyzkallerTestCase object, the test case to run.
-        """
-        test_command = test_case.GetRunCommand()
-        stdout, stderr, err_code = cmd_utils.ExecuteOneShellCommand(
-            test_command, timeout=18000)
-        if err_code:
-            logging.error(stderr)
-        else:
-            logging.info(stdout)
-        self.ReportTestCase(test_case)
-
-    def ReportTestCase(self, test_case):
-        """Asserts the result of the test case and uploads report to GCS.
-
-        Args:
-            test_case: SyzkallerTestCase object, the test case to report.
-        """
-        self.AssertTestCaseResult(test_case)
-        self._gcs_api_utils.UploadDir(test_case._work_dir_path,
-                                      'kernelfuzz_reports')
-
-    def AssertTestCaseResult(self, test_case):
-        """Asserts that test case finished as expected.
-
-        If crash reports were generated during the test, reports test as failure.
-        If crash reports were not generated during the test, reports test as success.
-
-        Args:
-            test_case: SyzkallerTestCase object, the test case to assert
-                       as failure or success.
-        """
-        logging.info('Test case results.')
-        crash_dir = os.path.join(test_case._work_dir_path, 'crashes')
-        if os.listdir(crash_dir) == []:
-            logging.info('%s did not cause crash in our device.',
-                         test_case._test_name)
-        else:
-            asserts.fail('%s caused crash in our device.',
-                         test_case._test_name)
-
-    def tearDownClass(self):
-        """Removes the temporary directory used for Syzkaller."""
-        logging.debug('Temporary directory %s is being deleted',
-                      self._env['temp_dir'])
-        try:
-            shutil.rmtree(self._env['temp_dir'])
-        except OSError as e:
-            logging.exception(e)
-
-    def generateKernelFuzzerTests(self):
-        """Runs kernel fuzzer tests."""
-        self.FetchSyzkaller()
-        self.runGeneratedTests(
-            test_func=self.RunTestCase,
-            settings=self.CreateTestCases(),
-            name_func=lambda x: x._test_name)
-
-
-if __name__ == '__main__':
-    test_runner.main()
diff --git a/kernel/syzkaller/syzkaller_test_case.py b/kernel/syzkaller/syzkaller_test_case.py
deleted file mode 100644
index 876fbf6..0000000
--- a/kernel/syzkaller/syzkaller_test_case.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import logging
-import os
-import time
-
-import environment_variables as env
-
-
-class SyzkallerTestCase(object):
-    """Represents syzkaller test case.
-
-    Attributes:
-        _env: dict, inverted map of environment varialbes for this test.
-        _device_target: string, OS of the target device.
-        _device_code: string, serial number of the target device.
-        _device_type: string, type of the target device.
-        _reproduce: boolean, whether or not to reproduce if a crash is found.
-        _http: integer, path to localhost where the test information will be shown.
-        _procs: integer, number of processes this test case will use if available.
-        _test_name: string, the unique name for this test case.
-        _work_dir_path: string, path to the work directory for this test case.
-        _config_file_path: string, path to the config file for this test case.
-    """
-
-    def __init__(self, env, device_target, device_code, device_type, reproduce,
-                 procs):
-        self._env = env
-        self._device_target = device_target
-        self._device_code = device_code
-        self._device_type = device_type
-        self._reproduce = reproduce
-        self._http = 'localhost:50000'
-        self._procs = procs
-        self._test_name = self.GenerateTestName()
-        self._work_dir_path = self.GenerateCorpusDir()
-        self._config_file_path = self.GenerateConfigFile()
-
-    def GenerateTestName(self):
-        """Uses device code and time to create unique name
-
-        Returns:
-            test_name, string, the unique test name for this test case.
-        """
-        test_name = '%s_%s_%d' % (time.strftime('%Y-%m-%d'), self._device_code,
-                                  int(time.time()))
-        return str(test_name)
-
-    def GenerateCorpusDir(self):
-        """Creates working directory for this test case.
-
-        Returns:
-            work_dir_path, string, path to the working directory for this test case.
-        """
-        work_dir_path = os.path.join(self._env['syzkaller_work_dir'],
-                                     self._test_name)
-        if not os.path.exists(work_dir_path):
-            os.makedirs(work_dir_path)
-        return work_dir_path
-
-    def GenerateConfigFile(self):
-        """Creates configuration file for this test case.
-
-        Returns:
-            config_file_path, string, path to the configuration file for this test case.
-        """
-
-        # read template config
-        with open(self._env['template_cfg'], 'r') as temp:
-            template_cfg = str(temp.read())
-
-        # fill out template
-        template_cfg = template_cfg.replace('{device_target}',
-                                            self._device_target)
-        template_cfg = template_cfg.replace('{reproduce}', self._reproduce)
-        template_cfg = template_cfg.replace('{work_dir_path}',
-                                            self._work_dir_path)
-        template_cfg = template_cfg.replace('{http}', self._http)
-        template_cfg = template_cfg.replace('{syzkaller_dir_path}',
-                                            self._env['syzkaller_dir'])
-        template_cfg = template_cfg.replace('{device_code}', self._device_code)
-        template_cfg = template_cfg.replace('{device_type}', self._device_type)
-        template_cfg = template_cfg.replace('{procs}', str(self._procs))
-
-        # save config file
-        config_file_path = self._work_dir_path + str('.cfg')
-        with open(config_file_path, 'w') as config_file:
-            config_file.write(template_cfg)
-        return config_file_path
-
-    def GetRunCommand(self):
-        """Creates test run command for this case.
-
-        Returns:
-            test_command, string, test run command for this test case.
-        """
-        syz_manager_path = os.path.join(self._env['syzkaller_bin_dir'],
-                                        'syz-manager')
-        test_command = '%s -config=%s' % (syz_manager_path,
-                                          self._config_file_path)
-        return test_command
diff --git a/script/__init__.py b/script/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/script/__init__.py
+++ /dev/null
diff --git a/script/config/__init__.py b/script/config/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/script/config/__init__.py
+++ /dev/null
diff --git a/script/config/config_gen.py b/script/config/config_gen.py
deleted file mode 100644
index b2da863..0000000
--- a/script/config/config_gen.py
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the 'License');
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an 'AS IS' BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import os
-import sys
-
-from importlib import import_module
-from xml.etree import ElementTree
-
-
-class FuzzerType(object):
-    """Types of fuzzers."""
-    FUNC_FUZZER = 0
-    IFACE_FUZZER = 1
-
-
-class ConfigGen(object):
-    """Config generator for test/vts-testcase/fuzz.
-
-    Attributes:
-        _android_build_top: string, equal to environment variable ANDROID_BUILD_TOP.
-        _project_path: string, path to test/vts-testcase/fuzz.
-        _template_dir: string, path to directory containing templates.
-        _utils: test/vts-testcase/hal/script/build/config_gen_utils module.
-        _vts_spec_parser: tools that generates and parses vts spec with hidl-gen.
-    """
-
-    def __init__(self):
-        """ConfigGen constructor. """
-        self._android_build_top = os.environ.get('ANDROID_BUILD_TOP')
-        if not self._android_build_top:
-            print 'Run "lunch" command first.'
-            sys.exit(1)
-        self._project_path = os.path.join(self._android_build_top, 'test',
-                                          'vts-testcase', 'fuzz')
-        self._template_dir = os.path.join(self._project_path, 'script',
-                                          'config', 'template')
-        sys.path.append(
-            os.path.join(self._android_build_top, 'test', 'vts-testcase', 'hal',
-                         'script', 'build'))
-        vts_spec_parser = import_module('vts_spec_parser')
-        self._utils = import_module('build_rule_gen_utils')
-        self._vts_spec_parser = vts_spec_parser.VtsSpecParser()
-
-    def _GetPlansFromConfig(self, xml_file_path):
-        """Gets plan names from a module config.
-
-        Args:
-            xml_file_path: string, path to the XML file.
-
-        Returns:
-            list of strings, the plans that the module belongs to.
-        """
-        root = ElementTree.parse(xml_file_path).getroot()
-        plans = [e.attrib["value"] for e in root.iterfind("option") if
-                 e.get("name", "") == "config-descriptor:metadata" and
-                 e.get("key", "") == "plan" and
-                 "value" in e.attrib]
-        return plans
-
-    def UpdateFuzzerConfigs(self):
-        """Updates build rules for fuzzers.
-
-        Updates fuzzer configs for each pair of (hal_name, hal_version).
-        """
-        config_dir = os.path.join(self._project_path, 'config')
-        old_config = dict()
-
-        for base_dir, dirs, files, in os.walk(config_dir):
-            for file_name in files:
-                file_path = os.path.join(base_dir, file_name)
-                if file_name == 'AndroidTest.xml':
-                    old_config[file_path] = self._GetPlansFromConfig(file_path)
-                if file_name in ('AndroidTest.xml', 'Android.bp'):
-                    os.remove(file_path)
-
-        self.UpdateFuzzerConfigsForType(FuzzerType.IFACE_FUZZER, old_config)
-
-    def UpdateFuzzerConfigsForType(self, fuzzer_type, old_config):
-        """Updates build rules for fuzzers.
-
-        Updates fuzzer configs for given fuzzer type.
-
-        Args:
-            fuzzer_type: FuzzerType, type of fuzzer.
-            old_config: dict. The key is the path to the old XML. The value is
-                the list of the plans the module belongs to.
-        """
-        bp_template_path = os.path.join(self._template_dir, 'template.bp')
-        xml_template_path = os.path.join(self._template_dir, 'template.xml')
-        with open(bp_template_path) as template_file:
-            bp_template = str(template_file.read())
-        with open(xml_template_path) as template_file:
-            xml_template = str(template_file.read())
-
-        hal_list = self._vts_spec_parser.HalNamesAndVersions()
-        for hal_name, hal_version in hal_list:
-            if not self._IsTestable(hal_name, hal_version):
-                continue
-            fuzzer_type_subdir = self._FuzzerTypeUnderscore(fuzzer_type)
-            config_dir = os.path.join(
-                self._project_path, 'config', self._utils.HalNameDir(hal_name),
-                self._utils.HalVerDir(hal_version), fuzzer_type_subdir)
-            bp_file_path = os.path.join(config_dir, 'Android.bp')
-            xml_file_path = os.path.join(config_dir, 'AndroidTest.xml')
-
-            plan = 'vts-staging-fuzz'
-            if xml_file_path in old_config:
-                old_plans = old_config[xml_file_path]
-                if old_plans:
-                    plan = old_plans[0]
-                else:
-                    print('WARNING: No plan name in %s' % xml_file_path)
-                if len(old_plans) > 1:
-                    print('WARNING: More than one plan name in %s' %
-                          xml_file_path)
-
-            bp_string = self._FillOutTemplate(
-                hal_name, hal_version, fuzzer_type, plan, bp_template)
-
-            xml_string = self._FillOutTemplate(
-                hal_name, hal_version, fuzzer_type, plan, xml_template)
-
-            self._utils.WriteBuildRule(bp_file_path, bp_string)
-            self._utils.WriteBuildRule(xml_file_path, xml_string)
-
-    def _FuzzerTestName(self, hal_name, hal_version, fuzzer_type):
-        """Returns vts hal fuzzer test module name.
-
-        Args:
-            hal_name: string, name of the hal, e.g. 'vibrator'.
-            hal_version: string, version of the hal, e.g '7.4'
-            fuzzer_type: FuzzerType, type of fuzzer.
-
-        Returns:
-            string, test module name, e.g. VtsHalVibratorV7_4FuncFuzzer
-        """
-        test_name = 'VtsHal'
-        test_name += ''.join(map(lambda x: x.title(), hal_name.split('.')))
-        test_name += self._utils.HalVerDir(hal_version)
-        test_name += self._FuzzerTypeCamel(fuzzer_type)
-        return test_name
-
-    def _FuzzerTypeUnderscore(self, fuzzer_type):
-        """Returns vts hal fuzzer type string in underscore case.
-
-        Args:
-            fuzzer_type: FuzzerType, type of fuzzer.
-
-        Returns:
-            string, fuzzer type, e.g. "iface_fuzzer"
-        """
-        if fuzzer_type == FuzzerType.FUNC_FUZZER:
-            test_type = 'func_fuzzer'
-        else:
-            test_type = 'iface_fuzzer'
-        return test_type
-
-    def _FuzzerTypeCamel(self, fuzzer_type):
-        """Returns vts hal fuzzer type string in camel case.
-
-        Args:
-            fuzzer_type: FuzzerType, type of fuzzer.
-
-        Returns:
-            string, fuzzer type, e.g. "IfaceFuzzer"
-        """
-        if fuzzer_type == FuzzerType.FUNC_FUZZER:
-            test_type = 'FuncFuzzer'
-        else:
-            test_type = 'IfaceFuzzer'
-        return test_type
-
-    def _FillOutTemplate(self, hal_name, hal_version, fuzzer_type, plan,
-                         template):
-        """Returns build rules in string form by filling out given template.
-
-        Args:
-            hal_name: string, name of the hal, e.g. 'vibrator'.
-            hal_version: string, version of the hal, e.g '7.4'
-            fuzzer_type: FuzzerType, type of fuzzer.
-            plan: string, name of the plan, e.g. 'vts-staging-fuzz'
-            template: string, build rule template to fill out.
-
-        Returns:
-            string, complete build rule in string form.
-        """
-        config = template
-        config = config.replace('{TEST_NAME}', self._FuzzerTestName(
-            hal_name, hal_version, fuzzer_type))
-        config = config.replace('{HAL_NAME}', hal_name)
-        config = config.replace('{HAL_VERSION}', hal_version)
-        config = config.replace('{TEST_TYPE_CAMEL}',
-                                self._FuzzerTypeCamel(fuzzer_type))
-        config = config.replace('{TEST_TYPE_UNDERSCORE}',
-                                self._FuzzerTypeUnderscore(fuzzer_type))
-        config = config.replace('{PLAN}', plan)
-        return config
-
-    def _IsTestable(self, hal_name, hal_version):
-        """Returns true iff hal can be tested."""
-        if 'tests' in hal_name:
-            return False
-        return True
diff --git a/script/config/template/template.bp b/script/config/template/template.bp
deleted file mode 100644
index 778e023..0000000
--- a/script/config/template/template.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
-// Do not edit manually.
-
-vts_config {
-    name: "{TEST_NAME}",
-}
diff --git a/script/config/template/template.mk b/script/config/template/template.mk
deleted file mode 100644
index 3f0a95d..0000000
--- a/script/config/template/template.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-# Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := {TEST_NAME}
-include test/vts/tools/build/Android.host_config.mk
diff --git a/script/config/template/template.xml b/script/config/template/template.xml
deleted file mode 100644
index 8102085..0000000
--- a/script/config/template/template.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file was auto-generated by test/vts-testcase/fuzz/script/update_makefiles.py.
-     Do not edit manually.
--->
-<configuration description="Config for {TEST_NAME} test cases">
-    <option name="config-descriptor:metadata" key="plan" value="{PLAN}" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="{TEST_TYPE_CAMEL}Test.push"/>
-    </target_preparer>
-    <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}"/>
-        <option name="test-case-path" value="vts/testcases/fuzz/template/{TEST_TYPE_UNDERSCORE}_test/{TEST_TYPE_UNDERSCORE}_test"/>
-        <option name="test-timeout" value="3h"/>
-    </test>
-</configuration>
diff --git a/script/update_configs.py b/script/update_configs.py
deleted file mode 100644
index 08b3701..0000000
--- a/script/update_configs.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-"""Updates .bp, .mk, .xml files under test/vts-testcase/fuzz.
-
-Among files affected are:
-Config Files:
-1. files matching: test/vts-testcase/fuzz/<hal_name>/<hal_version>/func_fuzzer/Android.mk
-2. files matching: test/vts-testcase/fuzz/<hal_name>/<hal_version>/func_fuzzer/AndroidTest.xml
-3. files matching: test/vts-testcase/fuzz/<hal_name>/<hal_version>/iface_fuzzer/Android.mk
-4. files matching: test/vts-testcase/fuzz/<hal_name>/<hal_version>/iface_fuzzer/AndroidTest.xml
-
-
-Usage:
-    python test/vts-testcase/fuzz/script/update_configs.py
-"""
-
-import os
-import sys
-
-from config.config_gen import ConfigGen
-
-ANDROID_BUILD_TOP = os.environ.get('ANDROID_BUILD_TOP')
-if not ANDROID_BUILD_TOP:
-    print 'Run "lunch" command first.'
-    sys.exit(1)
-
-if __name__ == '__main__':
-    print 'Updating config files.'
-    HAL_SCRIPT_DIR = os.path.join(ANDROID_BUILD_TOP, 'test', 'vts-testcase',
-                                  'hal', 'script')
-    sys.path.append(HAL_SCRIPT_DIR)
-    config_gen = ConfigGen()
-    config_gen.UpdateFuzzerConfigs()
diff --git a/template/__init__.py b/template/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/template/__init__.py
+++ /dev/null
diff --git a/template/func_fuzzer_test/__init__.py b/template/func_fuzzer_test/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/template/func_fuzzer_test/__init__.py
+++ /dev/null
diff --git a/template/func_fuzzer_test/func_fuzzer_test.py b/template/func_fuzzer_test/func_fuzzer_test.py
deleted file mode 100644
index c204caf..0000000
--- a/template/func_fuzzer_test/func_fuzzer_test.py
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the 'License');
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an 'AS IS' BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import logging
-import os
-import tempfile
-
-from vts.runners.host import keys
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import adb
-from vts.utils.python.controllers import android_device
-from vts.utils.python.common import vts_spec_utils
-from vts.utils.python.fuzzer import corpus_manager
-
-from vts.testcases.fuzz.template.libfuzzer_test import libfuzzer_test_config as config
-from vts.testcases.fuzz.template.libfuzzer_test import libfuzzer_test
-from vts.testcases.fuzz.template.libfuzzer_test import libfuzzer_test_case
-
-
-class FuncFuzzerTest(libfuzzer_test.LibFuzzerTest):
-    """Runs function fuzzer tests on target.
-
-    Attributes:
-        _dut: AndroidDevice, the device under test as config.
-        _test_cases: LibFuzzerTestCase list, list of test cases to run.
-        _vts_spec_parser: VtsSpecParser, used to parse .vts files.
-        _temp_dir: temporary directory, used as buffer between target and GCS.
-    """
-
-    def setUpClass(self):
-        """Creates a remote shell instance, and copies data files."""
-        required_params = [
-            keys.ConfigKeys.IKEY_DATA_FILE_PATH,
-            keys.ConfigKeys.IKEY_HAL_HIDL_PACKAGE_NAME,
-        ]
-        self.getUserParams(required_params)
-        logging.info('%s: %s', keys.ConfigKeys.IKEY_DATA_FILE_PATH,
-                     self.data_file_path)
-        logging.info('%s: %s', keys.ConfigKeys.IKEY_HAL_HIDL_PACKAGE_NAME,
-                     self.hal_hidl_package_name)
-
-        self._dut = self.android_devices[0]
-        self._dut.adb.shell('mkdir %s -p' % config.FUZZER_TEST_DIR)
-        self._vts_spec_parser = vts_spec_utils.VtsSpecParser(
-            self.data_file_path)
-        self._temp_dir = tempfile.mkdtemp()
-        self._corpus_manager = corpus_manager.CorpusManager(self.user_params, self._dut)
-
-    def _RegisteredInterfaces(self, hal_package):
-        """Returns a list of registered interfaces for a given hal package.
-
-        Args:
-            hal_package: string, name of hal package,
-                e.g. android.hardware.nfc@1.0
-
-        Returns:
-            list of string, list of interfaces from this package that are
-                registered on device under test.
-        """
-        # TODO: find a more robust way to query registered interfaces.
-        cmd = '"lshal | grep -v \* | grep -o %s::[[:alpha:]]* | sort -u"' % hal_package
-        out = str(self._dut.adb.shell(cmd)).split()
-        interfaces = map(lambda x: x.split('::')[-1], out)
-        return interfaces
-
-    def _FuzzerBinHostPath(self, hal_package, vts_spec_name):
-        """Returns path to fuzzer binary on host."""
-        vts_spec_name = vts_spec_name.replace('.vts', '')
-        bin_name = hal_package + '-vts.func_fuzzer.' + vts_spec_name
-        bin_host_path = os.path.join(self.data_file_path, 'DATA', 'bin',
-                                     bin_name)
-        return str(bin_host_path)
-
-    def _CreateTestCasesFromSpec(self, hal_package, vts_spec_name,
-                                 vts_spec_proto):
-        """Creates LibFuzzerTestCases.
-
-        Args:
-            hal_package: string, name of hal package,
-                e.g. android.hardware.nfc@1.0
-            vts_spec_name: string, e.g. 'Nfc.vts'.
-
-        Returns:
-            LibFuzzerTestCase list, one per function of interface corresponding
-                to vts_spec_name.
-        """
-        test_cases = []
-        for api in vts_spec_proto.interface.api:
-            additional_params = {'vts_target_func': api.name}
-            libfuzzer_params = config.FUZZER_DEFAULT_PARAMS
-            bin_host_path = self._FuzzerBinHostPath(hal_package, vts_spec_name)
-            test_case = libfuzzer_test_case.LibFuzzerTestCase(
-                bin_host_path, libfuzzer_params, additional_params)
-            test_case.test_name = api.name
-            test_cases.append(test_case)
-        return test_cases
-
-    # Override
-    def CreateTestCases(self):
-        """See base class."""
-        hal_package = self.hal_hidl_package_name
-        hal_name, hal_version = vts_spec_utils.HalPackageToNameAndVersion(
-            hal_package)
-        vts_spec_names = self._vts_spec_parser.VtsSpecNames(
-            hal_name, hal_version)
-
-        registered_interfaces = self._RegisteredInterfaces(
-            self.hal_hidl_package_name)
-        test_cases = []
-        for vts_spec_name in vts_spec_names:
-            vts_spec_proto = self._vts_spec_parser.VtsSpecProto(
-                hal_name, hal_version, vts_spec_name)
-            if not vts_spec_proto.component_name in registered_interfaces:
-                continue
-            test_cases += self._CreateTestCasesFromSpec(
-                hal_package, vts_spec_name, vts_spec_proto)
-        return test_cases
-
-
-if __name__ == '__main__':
-    test_runner.main()
diff --git a/template/iface_fuzzer_test/__init__.py b/template/iface_fuzzer_test/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/template/iface_fuzzer_test/__init__.py
+++ /dev/null
diff --git a/template/iface_fuzzer_test/iface_fuzzer_test.py b/template/iface_fuzzer_test/iface_fuzzer_test.py
deleted file mode 100644
index 35fd53b..0000000
--- a/template/iface_fuzzer_test/iface_fuzzer_test.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the 'License');
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an 'AS IS' BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import logging
-import os
-
-from vts.runners.host import keys
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import adb
-from vts.utils.python.controllers import android_device
-from vts.utils.python.common import vts_spec_utils
-
-from vts.testcases.fuzz.template.libfuzzer_test import libfuzzer_test_config as config
-from vts.testcases.fuzz.template.libfuzzer_test import libfuzzer_test_case
-from vts.testcases.fuzz.template.func_fuzzer_test import func_fuzzer_test
-
-
-class IfaceFuzzerTest(func_fuzzer_test.FuncFuzzerTest):
-    """Runs iface_fuzzer tests on target.
-
-    Attributes:
-        See func_fuzzer_test.
-    """
-    _VTS_SPEC_DIR_TARGET = os.path.join(config.FUZZER_TEST_DIR, 'spec')
-
-    def _PushVtsResources(self, hal_name, hal_version):
-        """Pushes resources needed for test to target device.
-
-        Args:
-            hal_name: string, name of the hal, e.g. 'vibrator'.
-            hal_version: string, version of the hal, e.g '7.4'
-        """
-        # Push .vts spec files.
-        hal_name_dir = vts_spec_utils.HalNameDir(hal_name)
-        src_dir = os.path.join(self.data_file_path, 'spec', 'hardware',
-                               'interfaces', hal_name_dir, hal_version, 'vts')
-        dst_dir = os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir,
-                               hal_version)
-
-        # Push corresponding VTS drivers.
-        driver_name = 'android.hardware.%s@%s-vts.driver.so' % (hal_name,
-                                                                hal_version)
-        asan_path = os.path.join(self.data_file_path, 'DATA', 'asan', 'system')
-        driver32 = os.path.join(asan_path, 'lib', driver_name)
-        driver64 = os.path.join(asan_path, 'lib64', driver_name)
-        try:
-            self._dut.adb.push(src_dir, dst_dir)
-            self._dut.adb.push(driver32, 'data/local/tmp/32')
-            self._dut.adb.push(driver64, 'data/local/tmp/64')
-        except adb.AdbError as e:
-            logging.exception(e)
-
-    def _VtsSpecDirsTarget(self, hal_name, hal_version):
-        """Returns a list of directories on target with .vts specs.
-
-        Args:
-            hal_name: string, name of the hal, e.g. 'vibrator'.
-            hal_version: string, version of the hal, e.g '7.4'
-
-        Returns:
-            string list, directories on target
-        """
-        hal_name_dir = vts_spec_utils.HalNameDir(hal_name)
-        spec_dirs = [os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir,
-                                  hal_version)]
-
-        imported_hals = self._vts_spec_parser.ImportedHals(hal_name,
-                                                           hal_version)
-        for name, version in imported_hals:
-            spec_dirs.append(
-                os.path.join(self._VTS_SPEC_DIR_TARGET,
-                             vts_spec_utils.HalNameDir(name), version))
-        return spec_dirs
-
-    # Override
-    def CreateTestCases(self):
-        """See base class."""
-        hal_package = self.hal_hidl_package_name
-        hal_name, hal_version = vts_spec_utils.HalPackageToNameAndVersion(
-            hal_package)
-
-        imported_hals = self._vts_spec_parser.IndirectImportedHals(hal_name,
-                                                                   hal_version)
-        self._PushVtsResources(hal_name, hal_version)
-        for name, version in imported_hals:
-            self._PushVtsResources(name, version)
-
-        registered_interfaces = self._RegisteredInterfaces(hal_package)
-        spec_dirs = ':'.join(self._VtsSpecDirsTarget(hal_name, hal_version))
-
-        test_cases = []
-        for iface in registered_interfaces:
-            additional_params = {
-                'vts_spec_dir': spec_dirs,
-                'vts_exec_size': 16,
-                'vts_target_iface': iface,
-            }
-            libfuzzer_params = config.FUZZER_DEFAULT_PARAMS.copy()
-            libfuzzer_params.update({
-                'max_len': 67108864,
-                'max_total_time': 600,
-            })
-            bin_host_path = os.path.join(self.data_file_path, 'DATA', 'bin',
-                                         'vts_proto_fuzzer')
-            test_case = libfuzzer_test_case.LibFuzzerTestCase(
-                bin_host_path, libfuzzer_params, additional_params)
-            test_case.test_name = iface
-            test_cases.append(test_case)
-
-        return test_cases
-
-    # Override
-    def LogCrashReport(self, test_case):
-        """See base class."""
-        # Re-run the failing test case in debug mode.
-        logging.info('Attempting to reproduce the failure.')
-        repro_cmd = '"%s %s"' % (test_case.GetRunCommand(debug_mode=True),
-                                 config.FUZZER_TEST_CRASH_REPORT)
-        self._dut.adb.shell(repro_cmd, no_except=True)
-
-
-if __name__ == '__main__':
-    test_runner.main()
diff --git a/template/libfuzzer_test/__init__.py b/template/libfuzzer_test/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/template/libfuzzer_test/__init__.py
+++ /dev/null
diff --git a/template/libfuzzer_test/libfuzzer_test.py b/template/libfuzzer_test/libfuzzer_test.py
deleted file mode 100644
index 28137c5..0000000
--- a/template/libfuzzer_test/libfuzzer_test.py
+++ /dev/null
@@ -1,298 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the 'License');
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an 'AS IS' BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import logging
-import os
-import shutil
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test
-from vts.runners.host import const
-from vts.runners.host import keys
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import adb
-from vts.utils.python.controllers import android_device
-from vts.utils.python.common import list_utils
-
-from vts.testcases.fuzz.template.libfuzzer_test import libfuzzer_test_config as config
-from vts.testcases.fuzz.template.libfuzzer_test.libfuzzer_test_case import LibFuzzerTestCase
-
-
-class LibFuzzerTest(base_test.BaseTestClass):
-    """Runs LLVM libfuzzer tests on target.
-
-    Attributes:
-        _dut: AndroidDevice, the device under test as config.
-    """
-
-    def setUpClass(self):
-        """Creates a remote shell instance, and copies data files."""
-        required_params = [
-            keys.ConfigKeys.IKEY_DATA_FILE_PATH,
-            keys.ConfigKeys.IKEY_BINARY_TEST_SOURCE,
-        ]
-        self.getUserParams(required_params)
-
-        logging.info('%s: %s', keys.ConfigKeys.IKEY_DATA_FILE_PATH,
-                     self.data_file_path)
-        logging.info('%s: %s', keys.ConfigKeys.IKEY_BINARY_TEST_SOURCE,
-                     self.binary_test_source)
-
-        self._dut = self.android_devices[0]
-        self._dut.stop()
-        self._dut.adb.shell('mkdir %s -p' % config.FUZZER_TEST_DIR)
-
-    def tearDownClass(self):
-        """Deletes all copied data."""
-        self._dut.adb.shell('rm -rf %s' % config.FUZZER_TEST_DIR)
-        self._dut.start()
-
-    def PushFiles(self, src):
-        """adb pushes test case file to target."""
-        push_src = os.path.join(self.data_file_path, src)
-        push_dst = config.FUZZER_TEST_DIR
-        self._dut.adb.push('%s %s' % (push_src, push_dst), no_except=True)
-        logging.info('Adb pushed: %s \nto: %s', push_src, push_dst)
-        return push_dst
-
-    def CreateTestCases(self):
-        """Creates LibFuzzerTestCase instances.
-
-        Returns:
-            LibFuzzerTestCase list.
-        """
-        test_cases = map(
-            lambda x: LibFuzzerTestCase(x, config.FUZZER_DEFAULT_PARAMS, {}),
-            self.binary_test_source)
-        return test_cases
-
-    def CreateCorpusOut(self, test_case):
-        """Creates corpus output directory on the target.
-
-        Args:
-            test_case: LibFuzzerTestCase object, current test case.
-
-        Throws:
-            throws an AdbError when there is an error in adb operations.
-        """
-        corpus_out = test_case.GetCorpusOutDir()
-        self._dut.adb.shell('mkdir %s -p' % corpus_out)
-
-    def RetrieveCorpusSeed(self, test_case):
-        """Retrieves corpus seed directory from GCS to the target.
-
-        Args:
-            test_case: LibFuzzerTestCase object, current test case.
-
-        Throws:
-            throws an AdbError when there is an error in adb operations.
-
-        Returns:
-            inuse_seed, the file path of the inuse seed in GCS, if fetch succeeded.
-            None, otherwise.
-        """
-        inuse_seed = self._corpus_manager.FetchCorpusSeed(
-            test_case._test_name, self._temp_dir)
-        local_corpus_seed_dir = os.path.join(
-            self._temp_dir, '%s_corpus_seed' % test_case._test_name)
-        if os.path.exists(local_corpus_seed_dir) and os.listdir(
-                local_corpus_seed_dir):
-            self._dut.adb.push(local_corpus_seed_dir, config.FUZZER_TEST_DIR)
-        else:
-            corpus_seed = test_case.GetCorpusSeedDir()
-            self._dut.adb.shell('mkdir %s -p' % corpus_seed)
-        return inuse_seed
-
-    def AnalyzeGeneratedCorpus(self, test_case):
-        """Analyzes the generated corpus body.
-
-        Args:
-            test_case: LibFuzzerTestCase object.
-
-        Returns:
-            number of newly generated corpus strings, if the out directory exists.
-            0, otherwise.
-        """
-        logging.info('temporary directory for this test: %s', self._temp_dir)
-        pulled_corpus_out_dir = os.path.join(
-            self._temp_dir, os.path.basename(test_case.GetCorpusOutDir()))
-        if os.path.exists(pulled_corpus_out_dir):
-            logging.info('corpus out directory pulled from target: %s',
-                         pulled_corpus_out_dir)
-            pulled_corpus = os.listdir(pulled_corpus_out_dir)
-            logging.debug(pulled_corpus)
-            logging.info('generated corpus size: %d', len(pulled_corpus))
-            return len(pulled_corpus)
-        else:
-            logging.error('corput out directory does not exist on the host.')
-            return 0
-
-    def EvaluateTestcase(self, test_case, result, inuse_seed):
-        """Evaluates the test result and moves the used seed accordingly.
-
-        Args:
-            test_case: LibFuzzerTestCase object.
-            result: a result dict object returned by the adb shell command.
-            inuse_seed: the seed used as input to this test case.
-
-        Raises:
-            signals.TestFailure when the testcase failed.
-        """
-        return_codes = result.get('return_codes', None)
-        if return_codes == config.ExitCode.FUZZER_TEST_PASS:
-            logging.info(
-                'adb shell fuzzing command exited normally with exitcode %d.',
-                result['return_codes'])
-            if inuse_seed is not None:
-                self._corpus_manager.InuseToDest(test_case._test_name,
-                                                 inuse_seed, 'corpus_complete')
-        elif return_codes == config.ExitCode.FUZZER_TEST_FAIL:
-            logging.info(
-                'adb shell fuzzing command exited normally with exitcode %d.',
-                result['return_codes'])
-            if inuse_seed is not None:
-                self._corpus_manager.InuseToDest(test_case._test_name,
-                                                 inuse_seed, 'corpus_crash')
-        else:
-            logging.error('adb shell fuzzing command exited abnormally.')
-            if inuse_seed is not None:
-                self._corpus_manager.InuseToDest(test_case._test_name,
-                                                 inuse_seed, 'corpus_error')
-
-    def RunTestcase(self, test_case):
-        """Runs the given test case and asserts the result.
-
-        Args:
-            test_case: LibFuzzerTestCase object.
-        """
-        self.PushFiles(test_case.bin_host_path)
-        self.CreateCorpusOut(test_case)
-        inuse_seed = self.RetrieveCorpusSeed(test_case)
-        if inuse_seed == 'locked':
-            # skip this test case
-            logging.warning('test case locked, skipping testcase %s.',
-                            test_case.test_name)
-            return
-
-        fuzz_cmd = '"%s"' % test_case.GetRunCommand()
-
-        result = {}
-        try:
-            result = self._dut.adb.shell(fuzz_cmd, no_except=True)
-        except adb.AdbError as e:
-            logging.exception(e)
-
-        corpus_trigger_dir = os.path.join(self._temp_dir,
-                                          test_case.GetCorpusTriggerDir())
-        os.makedirs(corpus_trigger_dir)
-        try:
-            self._dut.adb.pull(config.FUZZER_TEST_CRASH_REPORT,
-                               corpus_trigger_dir)
-        except adb.AdbError as e:
-            logging.exception(e)
-            logging.error('crash report was not created during test run.')
-
-        try:
-            self._dut.adb.pull(test_case.GetCorpusOutDir(), self._temp_dir)
-            self.AnalyzeGeneratedCorpus(test_case)
-            self._corpus_manager.UploadCorpusOutDir(test_case._test_name,
-                                                    self._temp_dir)
-        except adb.AdbError as e:
-            logging.exception(e)
-            logging.error('Device failed. Removing lock from GCS.')
-            self._corpus_manager.remove_lock(test_case._test_name)
-
-        if inuse_seed is not 'directory':
-            self.EvaluateTestcase(test_case, result, inuse_seed)
-        self.AssertTestResult(test_case, result)
-
-    def LogCrashReport(self, test_case):
-        """Logs crash-causing fuzzer input.
-
-        Reads the crash report file and logs the contents in format:
-        '\x01\x23\x45\x67\x89\xab\xcd\xef'
-
-        Args:
-            test_case: LibFuzzerTestCase object
-        """
-        touch_cmd = 'touch %s' % config.FUZZER_TEST_CRASH_REPORT
-        self._dut.adb.shell(touch_cmd)
-
-        # output is string of a hexdump from crash report file.
-        # From the example above, output would be '0123456789abcdef'.
-        xxd_cmd = 'xxd -p %s' % config.FUZZER_TEST_CRASH_REPORT
-        output = self._dut.adb.shell(xxd_cmd)
-        remove_chars = ['\r', '\t', '\n', ' ']
-        for char in remove_chars:
-            output = output.replace(char, '')
-
-        crash_report = ''
-        # output is guaranteed to be even in length since its a hexdump.
-        for offset in xrange(0, len(output), 2):
-            crash_report += '\\x%s' % output[offset:offset + 2]
-
-        logging.info('FUZZER_TEST_CRASH_REPORT for %s: "%s"',
-                     test_case.test_name, crash_report)
-
-    # TODO(trong): differentiate between crashes and sanitizer rule violations.
-    def AssertTestResult(self, test_case, result):
-        """Asserts that test case finished as expected.
-
-        Checks that device is in responsive state. If not, waits for boot
-        then reports test as failure. If it is, asserts that all test commands
-        returned exit code 0.
-
-        Args:
-            test_case: LibFuzzerTestCase object
-            result: dict(str, str, int), command results from shell.
-        """
-        logging.info('Test case results.')
-        logging.info('stdout: %s' % result[const.STDOUT])
-        logging.info('stderr: %s' % result[const.STDERR])
-        logging.info('exit code: %s' % result[const.EXIT_CODE])
-        if not self._dut.hasBooted():
-            self._dut.waitForBootCompletion()
-            asserts.fail('%s left the device in unresponsive state.' %
-                         test_case.test_name)
-
-        exit_code = result[const.EXIT_CODE]
-        if exit_code == config.ExitCode.FUZZER_TEST_FAIL:
-            #TODO(b/64123979): once normal fail happens, examine.
-            self.LogCrashReport(test_case)
-            asserts.fail('%s failed normally.' % test_case.test_name)
-        elif exit_code != config.ExitCode.FUZZER_TEST_PASS:
-            asserts.fail('%s failed abnormally.' % test_case.test_name)
-
-    def tearDownClass(self):
-        """Removes the temporary directory used for corpus management."""
-        logging.debug('Temporary directory %s is being deleted',
-                      self._temp_dir)
-        try:
-            shutil.rmtree(self._temp_dir)
-        except OSError as e:
-            logging.exception(e)
-
-    def generateFuzzerTests(self):
-        """Runs fuzzer tests."""
-        self.runGeneratedTests(
-            test_func=self.RunTestcase,
-            settings=self.CreateTestCases(),
-            name_func=lambda x: x.test_name)
-
-
-if __name__ == '__main__':
-    test_runner.main()
diff --git a/template/libfuzzer_test/libfuzzer_test_case.py b/template/libfuzzer_test/libfuzzer_test_case.py
deleted file mode 100644
index 13dd903..0000000
--- a/template/libfuzzer_test/libfuzzer_test_case.py
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import os
-
-from vts.utils.python.os import path_utils
-
-from vts.testcases.fuzz.template.libfuzzer_test import libfuzzer_test_config as config
-
-
-class LibFuzzerTestCase(object):
-    """Represents libfuzzer test case.
-
-    Attributes:
-        _bin_host_path: string, path to binary on host.
-        _bin_name: string, name of the binary.
-        _test_name: string, name of the test case.
-        _libfuzzer_params: dict, libfuzzer-specific parameters.
-        _additional_params: dict, additional parameters.
-    """
-
-    def __init__(self, bin_host_path, libfuzzer_params, additional_params):
-        self._bin_host_path = bin_host_path
-        self._libfuzzer_params = libfuzzer_params
-        self._additional_params = additional_params
-        self._binary_name = os.path.basename(bin_host_path)
-        self._test_name = self._binary_name
-
-    def _GetCorpusDir(self):
-        """Returns corpus directory name on target."""
-        corpus_dir = path_utils.JoinTargetPath(config.FUZZER_TEST_DIR,
-                                               '%s_corpus' % self._test_name)
-        return corpus_dir
-
-    def GetCorpusOutDir(self):
-        """Returns corpus output directory name on target."""
-        return self._GetCorpusDir() + '_out'
-
-    def GetCorpusSeedDir(self):
-        """Returns corpus seed directory name on target."""
-        return self._GetCorpusDir() + '_seed'
-
-    def GetCorpusTriggerDir(self):
-        """Returns basename of corpus trigger directory."""
-        return '%s_corpus_trigger' % self._test_name
-
-    def CreateFuzzerFlags(self):
-        """Creates flags for the fuzzer executable.
-
-        Returns:
-            string, of form '-<flag0>=<val0> -<flag1>=<val1> ... '
-        """
-        # Used to separate additional and libfuzzer flags.
-        DELIMITER = '--'
-        additional_flags = ' '.join(
-            ['--%s=%s' % (k, v) for k, v in self._additional_params.items()])
-        libfuzzer_flags = ' '.join(
-            ['-%s=%s' % (k, v) for k, v in self._libfuzzer_params.items()])
-        if not additional_flags:
-            flags = libfuzzer_flags
-        else:
-            flags = '%s %s %s' % (additional_flags, DELIMITER, libfuzzer_flags)
-        return flags
-
-    def GetRunCommand(self, debug_mode=False):
-        """Returns target shell command to run the fuzzer binary."""
-        test_flags = self.CreateFuzzerFlags()
-        corpus_out = '' if debug_mode else self.GetCorpusOutDir()
-        corpus_seed = '' if debug_mode else self.GetCorpusSeedDir()
-
-        cd_cmd = 'cd %s' % config.FUZZER_TEST_DIR
-        chmod_cmd = 'chmod 777 %s' % self._binary_name
-        ld_path = 'LD_LIBRARY_PATH=/data/local/tmp/64:/data/local/tmp/32:$LD_LIBRARY_PATH'
-        test_cmd = '%s ./%s %s %s %s' % (ld_path, self._binary_name,
-                                         corpus_out, corpus_seed, test_flags)
-        if not debug_mode:
-            test_cmd += ' > /dev/null'
-        return ' && '.join([cd_cmd, chmod_cmd, test_cmd])
-
-    @property
-    def test_name(self):
-        """Name of this test case."""
-        return str(self._test_name)
-
-    @test_name.setter
-    def test_name(self, name):
-        """Set name of this test case."""
-        self._test_name = name
-
-    @property
-    def bin_host_path(self):
-        """Host path to binary for this test case."""
-        return self._bin_host_path
diff --git a/template/libfuzzer_test/libfuzzer_test_config.py b/template/libfuzzer_test/libfuzzer_test_config.py
deleted file mode 100644
index c330f48..0000000
--- a/template/libfuzzer_test/libfuzzer_test_config.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-class ExitCode(object):
-    """Exit codes for test binaries."""
-    FUZZER_TEST_PASS = 0
-    # Default failure error code in LLVM libfuzzer.
-    FUZZER_TEST_FAIL = 77
-
-# Directory on the target where the tests are copied.
-FUZZER_TEST_DIR = "/data/local/tmp/libfuzzer_test"
-
-# Directory on the target where VTS specs are copied.
-FUZZER_SPEC_DIR = "/data/local/tmp/spec"
-
-# Directory under data_file_path on the host where fuzzer executables are.
-FUZZER_BIN_DIR = "DATA/bin"
-
-# File used to save crash-causing fuzzer input.
-FUZZER_TEST_CRASH_REPORT = FUZZER_TEST_DIR + "/crash_report"
-
-# Default parameters that will be passed to fuzzer executable.
-FUZZER_DEFAULT_PARAMS = {
-    "max_len": 100,
-    "max_total_time": 60,
-    "exact_artifact_path": FUZZER_TEST_CRASH_REPORT,
-    "timeout": 120,
-}