diff --git a/config/audio/V2_0/iface_fuzzer/Android.bp b/config/audio/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..831f4aa
--- /dev/null
+++ b/config/audio/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/audio/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 71a3736..0000000
--- a/config/audio/V2_0/iface_fuzzer/Android.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 := VtsHalAudioV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/V4_0/iface_fuzzer/Android.bp b/config/audio/V4_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..2d24c2b
--- /dev/null
+++ b/config/audio/V4_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/audio/V4_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 3e5aaa8..0000000
--- a/config/audio/V4_0/iface_fuzzer/Android.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 := VtsHalAudioV4_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/common/V2_0/iface_fuzzer/Android.bp b/config/audio/common/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..7758a94
--- /dev/null
+++ b/config/audio/common/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/audio/common/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index aa99542..0000000
--- a/config/audio/common/V2_0/iface_fuzzer/Android.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 := VtsHalAudioCommonV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/common/V4_0/iface_fuzzer/Android.bp b/config/audio/common/V4_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..fb4e2f8
--- /dev/null
+++ b/config/audio/common/V4_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/audio/common/V4_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 4ca096d..0000000
--- a/config/audio/common/V4_0/iface_fuzzer/Android.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 := VtsHalAudioCommonV4_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/effect/V2_0/iface_fuzzer/Android.bp b/config/audio/effect/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..6d13867
--- /dev/null
+++ b/config/audio/effect/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/audio/effect/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 5cb8157..0000000
--- a/config/audio/effect/V2_0/iface_fuzzer/Android.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 := VtsHalAudioEffectV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/audio/effect/V4_0/iface_fuzzer/Android.bp b/config/audio/effect/V4_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..daf353b
--- /dev/null
+++ b/config/audio/effect/V4_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/audio/effect/V4_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 19b61ff..0000000
--- a/config/audio/effect/V4_0/iface_fuzzer/Android.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 := VtsHalAudioEffectV4_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/authsecret/V1_0/iface_fuzzer/Android.bp b/config/authsecret/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..5108cb9
--- /dev/null
+++ b/config/authsecret/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/authsecret/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index b633198..0000000
--- a/config/authsecret/V1_0/iface_fuzzer/Android.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 := VtsHalAuthsecretV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.bp b/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..10a369b
--- /dev/null
+++ b/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index a9b8f05..0000000
--- a/config/automotive/audiocontrol/V1_0/iface_fuzzer/Android.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 := VtsHalAutomotiveAudiocontrolV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/automotive/evs/V1_0/iface_fuzzer/Android.bp b/config/automotive/evs/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..862bd2a
--- /dev/null
+++ b/config/automotive/evs/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/automotive/evs/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 0641457..0000000
--- a/config/automotive/evs/V1_0/iface_fuzzer/Android.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 := VtsHalAutomotiveEvsV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/Android.bp b/config/automotive/vehicle/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..6ae09f4
--- /dev/null
+++ b/config/automotive/vehicle/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/automotive/vehicle/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 23eb5c9..0000000
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/Android.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 := VtsHalAutomotiveVehicleV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.bp b/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..82b151a
--- /dev/null
+++ b/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.mk
deleted file mode 100644
index b2cf8c0..0000000
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/Android.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 := VtsHalBiometricsFingerprintV2_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/bluetooth/V1_0/iface_fuzzer/Android.bp b/config/bluetooth/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..3c8014d
--- /dev/null
+++ b/config/bluetooth/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/bluetooth/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index f63498c..0000000
--- a/config/bluetooth/V1_0/iface_fuzzer/Android.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 := VtsHalBluetoothV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/boot/V1_0/iface_fuzzer/Android.bp b/config/boot/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..c578611
--- /dev/null
+++ b/config/boot/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/boot/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 96271d8..0000000
--- a/config/boot/V1_0/iface_fuzzer/Android.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 := VtsHalBootV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/broadcastradio/V1_0/iface_fuzzer/Android.bp b/config/broadcastradio/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..ff785eb
--- /dev/null
+++ b/config/broadcastradio/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/broadcastradio/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 5f9eb31..0000000
--- a/config/broadcastradio/V1_0/iface_fuzzer/Android.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 := VtsHalBroadcastradioV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/broadcastradio/V1_1/iface_fuzzer/Android.bp b/config/broadcastradio/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..1d64911
--- /dev/null
+++ b/config/broadcastradio/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/broadcastradio/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 5a4d1e4..0000000
--- a/config/broadcastradio/V1_1/iface_fuzzer/Android.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 := VtsHalBroadcastradioV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/broadcastradio/V2_0/iface_fuzzer/Android.bp b/config/broadcastradio/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..6fdd54a
--- /dev/null
+++ b/config/broadcastradio/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/broadcastradio/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 9237402..0000000
--- a/config/broadcastradio/V2_0/iface_fuzzer/Android.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 := VtsHalBroadcastradioV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/common/V1_0/iface_fuzzer/Android.bp b/config/camera/common/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..c16f41c
--- /dev/null
+++ b/config/camera/common/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/common/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index ea94414..0000000
--- a/config/camera/common/V1_0/iface_fuzzer/Android.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 := VtsHalCameraCommonV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/device/V1_0/iface_fuzzer/Android.bp b/config/camera/device/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..bf3d927
--- /dev/null
+++ b/config/camera/device/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/device/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 89a037e..0000000
--- a/config/camera/device/V1_0/iface_fuzzer/Android.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 := VtsHalCameraDeviceV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/device/V3_2/iface_fuzzer/Android.bp b/config/camera/device/V3_2/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..396fade
--- /dev/null
+++ b/config/camera/device/V3_2/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/device/V3_2/iface_fuzzer/Android.mk
deleted file mode 100644
index 8244052..0000000
--- a/config/camera/device/V3_2/iface_fuzzer/Android.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 := VtsHalCameraDeviceV3_2IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/device/V3_3/iface_fuzzer/Android.bp b/config/camera/device/V3_3/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..04f3a43
--- /dev/null
+++ b/config/camera/device/V3_3/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/device/V3_3/iface_fuzzer/Android.mk
deleted file mode 100644
index 7b6fb09..0000000
--- a/config/camera/device/V3_3/iface_fuzzer/Android.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 := VtsHalCameraDeviceV3_3IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/device/V3_4/iface_fuzzer/Android.bp b/config/camera/device/V3_4/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..7ed0cc1
--- /dev/null
+++ b/config/camera/device/V3_4/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/device/V3_4/iface_fuzzer/Android.mk
deleted file mode 100644
index 7bac5a0..0000000
--- a/config/camera/device/V3_4/iface_fuzzer/Android.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 := VtsHalCameraDeviceV3_4IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/metadata/V3_2/iface_fuzzer/Android.bp b/config/camera/metadata/V3_2/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..04c9f26
--- /dev/null
+++ b/config/camera/metadata/V3_2/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/metadata/V3_2/iface_fuzzer/Android.mk
deleted file mode 100644
index b546f4a..0000000
--- a/config/camera/metadata/V3_2/iface_fuzzer/Android.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 := VtsHalCameraMetadataV3_2IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/metadata/V3_3/iface_fuzzer/Android.bp b/config/camera/metadata/V3_3/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..514f6e1
--- /dev/null
+++ b/config/camera/metadata/V3_3/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/metadata/V3_3/iface_fuzzer/Android.mk
deleted file mode 100644
index 8bd1244..0000000
--- a/config/camera/metadata/V3_3/iface_fuzzer/Android.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 := VtsHalCameraMetadataV3_3IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/camera/provider/V2_4/iface_fuzzer/Android.bp b/config/camera/provider/V2_4/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..cf2fb63
--- /dev/null
+++ b/config/camera/provider/V2_4/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/camera/provider/V2_4/iface_fuzzer/Android.mk
deleted file mode 100644
index 902c183..0000000
--- a/config/camera/provider/V2_4/iface_fuzzer/Android.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 := VtsHalCameraProviderV2_4IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/cas/V1_0/iface_fuzzer/Android.bp b/config/cas/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..3fe2517
--- /dev/null
+++ b/config/cas/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/cas/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 362e172..0000000
--- a/config/cas/V1_0/iface_fuzzer/Android.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 := VtsHalCasV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/cas/native/V1_0/iface_fuzzer/Android.bp b/config/cas/native/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..9143c86
--- /dev/null
+++ b/config/cas/native/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/cas/native/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 62529ac..0000000
--- a/config/cas/native/V1_0/iface_fuzzer/Android.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 := VtsHalCasNativeV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/configstore/V1_0/iface_fuzzer/Android.bp b/config/configstore/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..ce25686
--- /dev/null
+++ b/config/configstore/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/configstore/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index cdd2550..0000000
--- a/config/configstore/V1_0/iface_fuzzer/Android.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 := VtsHalConfigstoreV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/configstore/V1_1/iface_fuzzer/Android.bp b/config/configstore/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..8fa5f0b
--- /dev/null
+++ b/config/configstore/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/configstore/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 194ab3d..0000000
--- a/config/configstore/V1_1/iface_fuzzer/Android.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 := VtsHalConfigstoreV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/confirmationui/V1_0/iface_fuzzer/Android.bp b/config/confirmationui/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..ede92ff
--- /dev/null
+++ b/config/confirmationui/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/confirmationui/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 3727175..0000000
--- a/config/confirmationui/V1_0/iface_fuzzer/Android.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 := VtsHalConfirmationuiV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/contexthub/V1_0/iface_fuzzer/Android.bp b/config/contexthub/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..bc2185e
--- /dev/null
+++ b/config/contexthub/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/contexthub/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 65f7919..0000000
--- a/config/contexthub/V1_0/iface_fuzzer/Android.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 := VtsHalContexthubV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/drm/V1_0/iface_fuzzer/Android.bp b/config/drm/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..849f247
--- /dev/null
+++ b/config/drm/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/drm/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index a9a205f..0000000
--- a/config/drm/V1_0/iface_fuzzer/Android.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 := VtsHalDrmV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/drm/V1_1/iface_fuzzer/Android.bp b/config/drm/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..711c0d0
--- /dev/null
+++ b/config/drm/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/drm/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 0e071e3..0000000
--- a/config/drm/V1_1/iface_fuzzer/Android.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 := VtsHalDrmV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/dumpstate/V1_0/iface_fuzzer/Android.bp b/config/dumpstate/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..b99fc65
--- /dev/null
+++ b/config/dumpstate/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/dumpstate/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 204617a..0000000
--- a/config/dumpstate/V1_0/iface_fuzzer/Android.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 := VtsHalDumpstateV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/gatekeeper/V1_0/iface_fuzzer/Android.bp b/config/gatekeeper/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..4c71668
--- /dev/null
+++ b/config/gatekeeper/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/gatekeeper/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 1aea99b..0000000
--- a/config/gatekeeper/V1_0/iface_fuzzer/Android.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 := VtsHalGatekeeperV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/gnss/V1_0/iface_fuzzer/Android.bp b/config/gnss/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..437982c
--- /dev/null
+++ b/config/gnss/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/gnss/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 69f51b7..0000000
--- a/config/gnss/V1_0/iface_fuzzer/Android.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 := VtsHalGnssV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/gnss/V1_1/iface_fuzzer/Android.bp b/config/gnss/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..f64b147
--- /dev/null
+++ b/config/gnss/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/gnss/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index aed5e68..0000000
--- a/config/gnss/V1_1/iface_fuzzer/Android.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 := VtsHalGnssV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/Android.bp b/config/graphics/allocator/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..52baef8
--- /dev/null
+++ b/config/graphics/allocator/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/allocator/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 163c6b6..0000000
--- a/config/graphics/allocator/V2_0/iface_fuzzer/Android.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 := VtsHalGraphicsAllocatorV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.bp b/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..cac88b1
--- /dev/null
+++ b/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index dea5dd3..0000000
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/Android.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 := VtsHalGraphicsBufferqueueV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/common/V1_0/iface_fuzzer/Android.bp b/config/graphics/common/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..3aa282b
--- /dev/null
+++ b/config/graphics/common/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/common/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 890a8c3..0000000
--- a/config/graphics/common/V1_0/iface_fuzzer/Android.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 := VtsHalGraphicsCommonV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/common/V1_1/iface_fuzzer/Android.bp b/config/graphics/common/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..174b90a
--- /dev/null
+++ b/config/graphics/common/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/common/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 08c6f6a..0000000
--- a/config/graphics/common/V1_1/iface_fuzzer/Android.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 := VtsHalGraphicsCommonV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/composer/V2_1/iface_fuzzer/Android.bp b/config/graphics/composer/V2_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..eee7b6f
--- /dev/null
+++ b/config/graphics/composer/V2_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/composer/V2_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 73fc5a7..0000000
--- a/config/graphics/composer/V2_1/iface_fuzzer/Android.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 := VtsHalGraphicsComposerV2_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/composer/V2_2/iface_fuzzer/Android.bp b/config/graphics/composer/V2_2/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..c16d5d0
--- /dev/null
+++ b/config/graphics/composer/V2_2/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/composer/V2_2/iface_fuzzer/Android.mk
deleted file mode 100644
index a01fab5..0000000
--- a/config/graphics/composer/V2_2/iface_fuzzer/Android.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 := VtsHalGraphicsComposerV2_2IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/Android.bp b/config/graphics/mapper/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..160967e
--- /dev/null
+++ b/config/graphics/mapper/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/mapper/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index cb8ac51..0000000
--- a/config/graphics/mapper/V2_0/iface_fuzzer/Android.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 := VtsHalGraphicsMapperV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/graphics/mapper/V2_1/iface_fuzzer/Android.bp b/config/graphics/mapper/V2_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..c9ca732
--- /dev/null
+++ b/config/graphics/mapper/V2_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/graphics/mapper/V2_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 0146bd9..0000000
--- a/config/graphics/mapper/V2_1/iface_fuzzer/Android.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 := VtsHalGraphicsMapperV2_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/health/V1_0/iface_fuzzer/Android.bp b/config/health/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..03be02a
--- /dev/null
+++ b/config/health/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/health/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 1ff22cc..0000000
--- a/config/health/V1_0/iface_fuzzer/Android.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 := VtsHalHealthV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/health/V2_0/iface_fuzzer/Android.bp b/config/health/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..5e89714
--- /dev/null
+++ b/config/health/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/health/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index bfac587..0000000
--- a/config/health/V2_0/iface_fuzzer/Android.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 := VtsHalHealthV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/ir/V1_0/iface_fuzzer/Android.bp b/config/ir/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..d6142f8
--- /dev/null
+++ b/config/ir/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/ir/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 299af04..0000000
--- a/config/ir/V1_0/iface_fuzzer/Android.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 := VtsHalIrV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/keymaster/V3_0/iface_fuzzer/Android.bp b/config/keymaster/V3_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..d77bf49
--- /dev/null
+++ b/config/keymaster/V3_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/keymaster/V3_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 11163a1..0000000
--- a/config/keymaster/V3_0/iface_fuzzer/Android.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 := VtsHalKeymasterV3_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/keymaster/V4_0/iface_fuzzer/Android.bp b/config/keymaster/V4_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..51b5219
--- /dev/null
+++ b/config/keymaster/V4_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/keymaster/V4_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 00e83a9..0000000
--- a/config/keymaster/V4_0/iface_fuzzer/Android.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 := VtsHalKeymasterV4_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/light/V2_0/iface_fuzzer/Android.bp b/config/light/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..755b0f8
--- /dev/null
+++ b/config/light/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/light/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index da3d2fb..0000000
--- a/config/light/V2_0/iface_fuzzer/Android.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 := VtsHalLightV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/media/V1_0/iface_fuzzer/Android.bp b/config/media/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..dece316
--- /dev/null
+++ b/config/media/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/media/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 3a77335..0000000
--- a/config/media/V1_0/iface_fuzzer/Android.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 := VtsHalMediaV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/media/bufferpool/V1_0/iface_fuzzer/Android.bp b/config/media/bufferpool/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..b06d43b
--- /dev/null
+++ b/config/media/bufferpool/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/media/bufferpool/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 80019b9..0000000
--- a/config/media/bufferpool/V1_0/iface_fuzzer/Android.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 := VtsHalMediaBufferpoolV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/media/omx/V1_0/iface_fuzzer/Android.bp b/config/media/omx/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..731beb6
--- /dev/null
+++ b/config/media/omx/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/media/omx/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index ee0b40c..0000000
--- a/config/media/omx/V1_0/iface_fuzzer/Android.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 := VtsHalMediaOmxV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/memtrack/V1_0/iface_fuzzer/Android.bp b/config/memtrack/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..232ce80
--- /dev/null
+++ b/config/memtrack/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/memtrack/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index f1c5c88..0000000
--- a/config/memtrack/V1_0/iface_fuzzer/Android.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 := VtsHalMemtrackV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/neuralnetworks/V1_0/iface_fuzzer/Android.bp b/config/neuralnetworks/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..5e3e5d5
--- /dev/null
+++ b/config/neuralnetworks/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/neuralnetworks/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 84e315d..0000000
--- a/config/neuralnetworks/V1_0/iface_fuzzer/Android.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 := VtsHalNeuralnetworksV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/neuralnetworks/V1_1/iface_fuzzer/Android.bp b/config/neuralnetworks/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..17f58f8
--- /dev/null
+++ b/config/neuralnetworks/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/neuralnetworks/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 2aef785..0000000
--- a/config/neuralnetworks/V1_1/iface_fuzzer/Android.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 := VtsHalNeuralnetworksV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/nfc/V1_0/iface_fuzzer/Android.bp b/config/nfc/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..1b39d5a
--- /dev/null
+++ b/config/nfc/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/nfc/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index a6d1ea6..0000000
--- a/config/nfc/V1_0/iface_fuzzer/Android.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 := VtsHalNfcV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/nfc/V1_1/iface_fuzzer/Android.bp b/config/nfc/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..5a92255
--- /dev/null
+++ b/config/nfc/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/nfc/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 1487aa7..0000000
--- a/config/nfc/V1_1/iface_fuzzer/Android.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 := VtsHalNfcV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/oemlock/V1_0/iface_fuzzer/Android.bp b/config/oemlock/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..81c1724
--- /dev/null
+++ b/config/oemlock/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/oemlock/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 1439d24..0000000
--- a/config/oemlock/V1_0/iface_fuzzer/Android.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 := VtsHalOemlockV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/power/V1_0/iface_fuzzer/Android.bp b/config/power/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..32d428b
--- /dev/null
+++ b/config/power/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/power/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 4bc2461..0000000
--- a/config/power/V1_0/iface_fuzzer/Android.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 := VtsHalPowerV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/power/V1_1/iface_fuzzer/Android.bp b/config/power/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..b67534e
--- /dev/null
+++ b/config/power/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/power/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index fd73150..0000000
--- a/config/power/V1_1/iface_fuzzer/Android.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 := VtsHalPowerV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/power/V1_2/iface_fuzzer/Android.bp b/config/power/V1_2/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..b7a6b4e
--- /dev/null
+++ b/config/power/V1_2/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/power/V1_2/iface_fuzzer/Android.mk
deleted file mode 100644
index d228ac9..0000000
--- a/config/power/V1_2/iface_fuzzer/Android.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 := VtsHalPowerV1_2IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/radio/V1_0/iface_fuzzer/Android.bp b/config/radio/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..8343f59
--- /dev/null
+++ b/config/radio/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/radio/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index d1d484a..0000000
--- a/config/radio/V1_0/iface_fuzzer/Android.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 := VtsHalRadioV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/radio/V1_1/iface_fuzzer/Android.bp b/config/radio/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..5f0972f
--- /dev/null
+++ b/config/radio/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/radio/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 9a38bd3..0000000
--- a/config/radio/V1_1/iface_fuzzer/Android.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 := VtsHalRadioV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/radio/V1_2/iface_fuzzer/Android.bp b/config/radio/V1_2/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..ab6ed08
--- /dev/null
+++ b/config/radio/V1_2/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/radio/V1_2/iface_fuzzer/Android.mk
deleted file mode 100644
index 9c6152c..0000000
--- a/config/radio/V1_2/iface_fuzzer/Android.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 := VtsHalRadioV1_2IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/radio/config/V1_0/iface_fuzzer/Android.bp b/config/radio/config/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..3a0b370
--- /dev/null
+++ b/config/radio/config/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/radio/config/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 2ef395f..0000000
--- a/config/radio/config/V1_0/iface_fuzzer/Android.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 := VtsHalRadioConfigV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/radio/deprecated/V1_0/iface_fuzzer/Android.bp b/config/radio/deprecated/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..471da2f
--- /dev/null
+++ b/config/radio/deprecated/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/radio/deprecated/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index ffcf752..0000000
--- a/config/radio/deprecated/V1_0/iface_fuzzer/Android.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 := VtsHalRadioDeprecatedV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/renderscript/V1_0/iface_fuzzer/Android.bp b/config/renderscript/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..31ba63d
--- /dev/null
+++ b/config/renderscript/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/renderscript/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index b6d9462..0000000
--- a/config/renderscript/V1_0/iface_fuzzer/Android.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 := VtsHalRenderscriptV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/secure_element/V1_0/iface_fuzzer/Android.bp b/config/secure_element/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..bc7d3b4
--- /dev/null
+++ b/config/secure_element/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/secure_element/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 8d9ca87..0000000
--- a/config/secure_element/V1_0/iface_fuzzer/Android.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 := VtsHalSecure_ElementV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/sensors/V1_0/iface_fuzzer/Android.bp b/config/sensors/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..57e18cb
--- /dev/null
+++ b/config/sensors/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/sensors/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 7a2e509..0000000
--- a/config/sensors/V1_0/iface_fuzzer/Android.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 := VtsHalSensorsV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/soundtrigger/V2_0/iface_fuzzer/Android.bp b/config/soundtrigger/V2_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..a210773
--- /dev/null
+++ b/config/soundtrigger/V2_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/soundtrigger/V2_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 843348c..0000000
--- a/config/soundtrigger/V2_0/iface_fuzzer/Android.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 := VtsHalSoundtriggerV2_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/soundtrigger/V2_1/iface_fuzzer/Android.bp b/config/soundtrigger/V2_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..b4ae866
--- /dev/null
+++ b/config/soundtrigger/V2_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/soundtrigger/V2_1/iface_fuzzer/Android.mk
deleted file mode 100644
index b5568aa..0000000
--- a/config/soundtrigger/V2_1/iface_fuzzer/Android.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 := VtsHalSoundtriggerV2_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/tetheroffload/config/V1_0/iface_fuzzer/Android.bp b/config/tetheroffload/config/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..99c23b1
--- /dev/null
+++ b/config/tetheroffload/config/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/tetheroffload/config/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 2b25c56..0000000
--- a/config/tetheroffload/config/V1_0/iface_fuzzer/Android.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 := VtsHalTetheroffloadConfigV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/tetheroffload/control/V1_0/iface_fuzzer/Android.bp b/config/tetheroffload/control/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..bdb2f86
--- /dev/null
+++ b/config/tetheroffload/control/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/tetheroffload/control/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index b2327cd..0000000
--- a/config/tetheroffload/control/V1_0/iface_fuzzer/Android.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 := VtsHalTetheroffloadControlV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/thermal/V1_0/iface_fuzzer/Android.bp b/config/thermal/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..1f68971
--- /dev/null
+++ b/config/thermal/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/thermal/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 5e238ad..0000000
--- a/config/thermal/V1_0/iface_fuzzer/Android.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 := VtsHalThermalV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/thermal/V1_1/iface_fuzzer/Android.bp b/config/thermal/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..921de80
--- /dev/null
+++ b/config/thermal/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/thermal/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index f371ea3..0000000
--- a/config/thermal/V1_1/iface_fuzzer/Android.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 := VtsHalThermalV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/tv/cec/V1_0/iface_fuzzer/Android.bp b/config/tv/cec/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..1874a26
--- /dev/null
+++ b/config/tv/cec/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/tv/cec/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 858174b..0000000
--- a/config/tv/cec/V1_0/iface_fuzzer/Android.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 := VtsHalTvCecV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/tv/input/V1_0/iface_fuzzer/Android.bp b/config/tv/input/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..ae0ca2c
--- /dev/null
+++ b/config/tv/input/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/tv/input/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index e5c03db..0000000
--- a/config/tv/input/V1_0/iface_fuzzer/Android.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 := VtsHalTvInputV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/usb/V1_0/iface_fuzzer/Android.bp b/config/usb/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..cdbc8af
--- /dev/null
+++ b/config/usb/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/usb/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 70db5bc..0000000
--- a/config/usb/V1_0/iface_fuzzer/Android.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 := VtsHalUsbV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/usb/V1_1/iface_fuzzer/Android.bp b/config/usb/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..12b345c
--- /dev/null
+++ b/config/usb/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/usb/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 3082a08..0000000
--- a/config/usb/V1_1/iface_fuzzer/Android.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 := VtsHalUsbV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/usb/gadget/V1_0/iface_fuzzer/Android.bp b/config/usb/gadget/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..1f8749d
--- /dev/null
+++ b/config/usb/gadget/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/usb/gadget/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index e167000..0000000
--- a/config/usb/gadget/V1_0/iface_fuzzer/Android.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 := VtsHalUsbGadgetV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/vibrator/V1_0/iface_fuzzer/Android.bp b/config/vibrator/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..1144a4f
--- /dev/null
+++ b/config/vibrator/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/vibrator/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 9ac8da0..0000000
--- a/config/vibrator/V1_0/iface_fuzzer/Android.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 := VtsHalVibratorV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/vibrator/V1_1/iface_fuzzer/Android.bp b/config/vibrator/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..a07eee7
--- /dev/null
+++ b/config/vibrator/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/vibrator/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index b69c673..0000000
--- a/config/vibrator/V1_1/iface_fuzzer/Android.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 := VtsHalVibratorV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/vibrator/V1_2/iface_fuzzer/Android.bp b/config/vibrator/V1_2/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..71e8988
--- /dev/null
+++ b/config/vibrator/V1_2/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/vibrator/V1_2/iface_fuzzer/Android.mk
deleted file mode 100644
index dd26d03..0000000
--- a/config/vibrator/V1_2/iface_fuzzer/Android.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 := VtsHalVibratorV1_2IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/vr/V1_0/iface_fuzzer/Android.bp b/config/vr/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..13a9fde
--- /dev/null
+++ b/config/vr/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/vr/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 291ef58..0000000
--- a/config/vr/V1_0/iface_fuzzer/Android.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 := VtsHalVrV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/weaver/V1_0/iface_fuzzer/Android.bp b/config/weaver/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..2e8f7c0
--- /dev/null
+++ b/config/weaver/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/weaver/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index f4f4a84..0000000
--- a/config/weaver/V1_0/iface_fuzzer/Android.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 := VtsHalWeaverV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/V1_0/iface_fuzzer/Android.bp b/config/wifi/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..0768d64
--- /dev/null
+++ b/config/wifi/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/wifi/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index fd66868..0000000
--- a/config/wifi/V1_0/iface_fuzzer/Android.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 := VtsHalWifiV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/V1_1/iface_fuzzer/Android.bp b/config/wifi/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..4a95412
--- /dev/null
+++ b/config/wifi/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/wifi/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 5dc99ce..0000000
--- a/config/wifi/V1_1/iface_fuzzer/Android.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 := VtsHalWifiV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/V1_2/iface_fuzzer/Android.bp b/config/wifi/V1_2/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..8a1a70b
--- /dev/null
+++ b/config/wifi/V1_2/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/wifi/V1_2/iface_fuzzer/Android.mk
deleted file mode 100644
index 5f4431a..0000000
--- a/config/wifi/V1_2/iface_fuzzer/Android.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 := VtsHalWifiV1_2IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/hostapd/V1_0/iface_fuzzer/Android.bp b/config/wifi/hostapd/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..2bee920
--- /dev/null
+++ b/config/wifi/hostapd/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/wifi/hostapd/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 1d664e3..0000000
--- a/config/wifi/hostapd/V1_0/iface_fuzzer/Android.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 := VtsHalWifiHostapdV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/offload/V1_0/iface_fuzzer/Android.bp b/config/wifi/offload/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..ea27ead
--- /dev/null
+++ b/config/wifi/offload/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/wifi/offload/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 6d494c9..0000000
--- a/config/wifi/offload/V1_0/iface_fuzzer/Android.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 := VtsHalWifiOffloadV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/Android.bp b/config/wifi/supplicant/V1_0/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..d9da865
--- /dev/null
+++ b/config/wifi/supplicant/V1_0/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/wifi/supplicant/V1_0/iface_fuzzer/Android.mk
deleted file mode 100644
index 521fbed..0000000
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/Android.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 := VtsHalWifiSupplicantV1_0IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/config/wifi/supplicant/V1_1/iface_fuzzer/Android.bp b/config/wifi/supplicant/V1_1/iface_fuzzer/Android.bp
new file mode 100644
index 0000000..b0fcd8c
--- /dev/null
+++ b/config/wifi/supplicant/V1_1/iface_fuzzer/Android.bp
@@ -0,0 +1,6 @@
+// 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/Android.mk b/config/wifi/supplicant/V1_1/iface_fuzzer/Android.mk
deleted file mode 100644
index 235648c..0000000
--- a/config/wifi/supplicant/V1_1/iface_fuzzer/Android.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 := VtsHalWifiSupplicantV1_1IfaceFuzzer
-include test/vts/tools/build/Android.host_config.mk
diff --git a/iface_fuzzer/Android.mk b/iface_fuzzer/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/iface_fuzzer/Android.mk
+++ /dev/null
@@ -1,19 +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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/kernel/syzkaller/Android.bp b/kernel/syzkaller/Android.bp
new file mode 100644
index 0000000..d8af068
--- /dev/null
+++ b/kernel/syzkaller/Android.bp
@@ -0,0 +1,19 @@
+//
+// 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/Android.mk b/kernel/syzkaller/Android.mk
deleted file mode 100644
index 01f29b0..0000000
--- a/kernel/syzkaller/Android.mk
+++ /dev/null
@@ -1,21 +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.
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsKernelFuzzTest
-include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/script/config/config_gen.py b/script/config/config_gen.py
index 8654c4d..b2da863 100644
--- a/script/config/config_gen.py
+++ b/script/config/config_gen.py
@@ -33,7 +33,7 @@
     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 containig templates.
+        _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.
     """
@@ -84,7 +84,7 @@
                 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.mk'):
+                if file_name in ('AndroidTest.xml', 'Android.bp'):
                     os.remove(file_path)
 
         self.UpdateFuzzerConfigsForType(FuzzerType.IFACE_FUZZER, old_config)
@@ -99,10 +99,10 @@
             old_config: dict. The key is the path to the old XML. The value is
                 the list of the plans the module belongs to.
         """
-        mk_template_path = os.path.join(self._template_dir, 'template.mk')
+        bp_template_path = os.path.join(self._template_dir, 'template.bp')
         xml_template_path = os.path.join(self._template_dir, 'template.xml')
-        with open(mk_template_path) as template_file:
-            mk_template = str(template_file.read())
+        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())
 
@@ -114,7 +114,7 @@
             config_dir = os.path.join(
                 self._project_path, 'config', self._utils.HalNameDir(hal_name),
                 self._utils.HalVerDir(hal_version), fuzzer_type_subdir)
-            mk_file_path = os.path.join(config_dir, 'Android.mk')
+            bp_file_path = os.path.join(config_dir, 'Android.bp')
             xml_file_path = os.path.join(config_dir, 'AndroidTest.xml')
 
             plan = 'vts-staging-fuzz'
@@ -128,13 +128,13 @@
                     print('WARNING: More than one plan name in %s' %
                           xml_file_path)
 
-            mk_string = self._FillOutTemplate(
-                hal_name, hal_version, fuzzer_type, plan, mk_template)
+            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(mk_file_path, mk_string)
+            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):
diff --git a/script/config/template/template.bp b/script/config/template/template.bp
new file mode 100644
index 0000000..778e023
--- /dev/null
+++ b/script/config/template/template.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated by test/vts-testcase/fuzz/script/update_configs.py.
+// Do not edit manually.
+
+vts_config {
+    name: "{TEST_NAME}",
+}