diff --git a/arm/Android.bp b/arm/Android.bp
index 7da2ff2..a7d3f25 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1,270 +1,6 @@
 // THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
 // DO NOT EDIT
 
-phony {
-    name: "vndk_v29_arm",
-    required: [
-        "android.frameworks.cameraservice.common@2.0.vndk.29.arm.vendor",
-        "android.frameworks.cameraservice.device@2.0.vndk.29.arm.vendor",
-        "android.frameworks.cameraservice.service@2.0.vndk.29.arm.vendor",
-        "android.frameworks.displayservice@1.0.vndk.29.arm.vendor",
-        "android.frameworks.schedulerservice@1.0.vndk.29.arm.vendor",
-        "android.frameworks.sensorservice@1.0.vndk.29.arm.vendor",
-        "android.frameworks.stats@1.0.vndk.29.arm.vendor",
-        "android.frameworks.vr.composer@1.0.vndk.29.arm.vendor",
-        "android.hardware.atrace@1.0.vndk.29.arm.vendor",
-        "android.hardware.audio.common@2.0.vndk.29.arm.vendor",
-        "android.hardware.audio.common@4.0.vndk.29.arm.vendor",
-        "android.hardware.audio.common@5.0.vndk.29.arm.vendor",
-        "android.hardware.audio.effect@2.0.vndk.29.arm.vendor",
-        "android.hardware.audio.effect@4.0.vndk.29.arm.vendor",
-        "android.hardware.audio.effect@5.0.vndk.29.arm.vendor",
-        "android.hardware.audio@2.0.vndk.29.arm.vendor",
-        "android.hardware.audio@4.0.vndk.29.arm.vendor",
-        "android.hardware.audio@5.0.vndk.29.arm.vendor",
-        "android.hardware.authsecret@1.0.vndk.29.arm.vendor",
-        "android.hardware.automotive.audiocontrol@1.0.vndk.29.arm.vendor",
-        "android.hardware.automotive.evs@1.0.vndk.29.arm.vendor",
-        "android.hardware.automotive.vehicle@2.0.vndk.29.arm.vendor",
-        "android.hardware.biometrics.face@1.0.vndk.29.arm.vendor",
-        "android.hardware.biometrics.fingerprint@2.1.vndk.29.arm.vendor",
-        "android.hardware.bluetooth.a2dp@1.0.vndk.29.arm.vendor",
-        "android.hardware.bluetooth.audio@2.0.vndk.29.arm.vendor",
-        "android.hardware.bluetooth@1.0.vndk.29.arm.vendor",
-        "android.hardware.boot@1.0.vndk.29.arm.vendor",
-        "android.hardware.broadcastradio@1.0.vndk.29.arm.vendor",
-        "android.hardware.broadcastradio@1.1.vndk.29.arm.vendor",
-        "android.hardware.broadcastradio@2.0.vndk.29.arm.vendor",
-        "android.hardware.camera.common@1.0.vndk.29.arm.vendor",
-        "android.hardware.camera.device@1.0.vndk.29.arm.vendor",
-        "android.hardware.camera.device@3.2.vndk.29.arm.vendor",
-        "android.hardware.camera.device@3.3.vndk.29.arm.vendor",
-        "android.hardware.camera.device@3.4.vndk.29.arm.vendor",
-        "android.hardware.camera.device@3.5.vndk.29.arm.vendor",
-        "android.hardware.camera.metadata@3.2.vndk.29.arm.vendor",
-        "android.hardware.camera.metadata@3.3.vndk.29.arm.vendor",
-        "android.hardware.camera.metadata@3.4.vndk.29.arm.vendor",
-        "android.hardware.camera.provider@2.4.vndk.29.arm.vendor",
-        "android.hardware.camera.provider@2.5.vndk.29.arm.vendor",
-        "android.hardware.cas.native@1.0.vndk.29.arm.vendor",
-        "android.hardware.cas@1.0.vndk.29.arm.vendor",
-        "android.hardware.cas@1.1.vndk.29.arm.vendor",
-        "android.hardware.configstore-utils.vndk.29.arm.vendor",
-        "android.hardware.configstore@1.0.vndk.29.arm.vendor",
-        "android.hardware.configstore@1.1.vndk.29.arm.vendor",
-        "android.hardware.confirmationui-support-lib.vndk.29.arm.vendor",
-        "android.hardware.confirmationui@1.0.vndk.29.arm.vendor",
-        "android.hardware.contexthub@1.0.vndk.29.arm.vendor",
-        "android.hardware.drm@1.0.vndk.29.arm.vendor",
-        "android.hardware.drm@1.1.vndk.29.arm.vendor",
-        "android.hardware.drm@1.2.vndk.29.arm.vendor",
-        "android.hardware.dumpstate@1.0.vndk.29.arm.vendor",
-        "android.hardware.fastboot@1.0.vndk.29.arm.vendor",
-        "android.hardware.gatekeeper@1.0.vndk.29.arm.vendor",
-        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.arm.vendor",
-        "android.hardware.gnss.visibility_control@1.0.vndk.29.arm.vendor",
-        "android.hardware.gnss@1.0.vndk.29.arm.vendor",
-        "android.hardware.gnss@1.1.vndk.29.arm.vendor",
-        "android.hardware.gnss@2.0.vndk.29.arm.vendor",
-        "android.hardware.graphics.allocator@2.0.vndk.29.arm.vendor",
-        "android.hardware.graphics.allocator@3.0.vndk.29.arm.vendor",
-        "android.hardware.graphics.bufferqueue@1.0.vndk.29.arm.vendor",
-        "android.hardware.graphics.bufferqueue@2.0.vndk.29.arm.vendor",
-        "android.hardware.graphics.composer@2.1.vndk.29.arm.vendor",
-        "android.hardware.graphics.composer@2.2.vndk.29.arm.vendor",
-        "android.hardware.graphics.composer@2.3.vndk.29.arm.vendor",
-        "android.hardware.health.storage@1.0.vndk.29.arm.vendor",
-        "android.hardware.health@1.0.vndk.29.arm.vendor",
-        "android.hardware.health@2.0.vndk.29.arm.vendor",
-        "android.hardware.input.classifier@1.0.vndk.29.arm.vendor",
-        "android.hardware.input.common@1.0.vndk.29.arm.vendor",
-        "android.hardware.ir@1.0.vndk.29.arm.vendor",
-        "android.hardware.keymaster@3.0.vndk.29.arm.vendor",
-        "android.hardware.keymaster@4.0.vndk.29.arm.vendor",
-        "android.hardware.light@2.0.vndk.29.arm.vendor",
-        "android.hardware.media.bufferpool@1.0.vndk.29.arm.vendor",
-        "android.hardware.media.bufferpool@2.0.vndk.29.arm.vendor",
-        "android.hardware.media.c2@1.0.vndk.29.arm.vendor",
-        "android.hardware.media.omx@1.0.vndk.29.arm.vendor",
-        "android.hardware.media@1.0.vndk.29.arm.vendor",
-        "android.hardware.memtrack@1.0.vndk.29.arm.vendor",
-        "android.hardware.neuralnetworks@1.0.vndk.29.arm.vendor",
-        "android.hardware.neuralnetworks@1.1.vndk.29.arm.vendor",
-        "android.hardware.neuralnetworks@1.2.vndk.29.arm.vendor",
-        "android.hardware.nfc@1.0.vndk.29.arm.vendor",
-        "android.hardware.nfc@1.1.vndk.29.arm.vendor",
-        "android.hardware.nfc@1.2.vndk.29.arm.vendor",
-        "android.hardware.oemlock@1.0.vndk.29.arm.vendor",
-        "android.hardware.power.stats@1.0.vndk.29.arm.vendor",
-        "android.hardware.power@1.0.vndk.29.arm.vendor",
-        "android.hardware.power@1.1.vndk.29.arm.vendor",
-        "android.hardware.power@1.2.vndk.29.arm.vendor",
-        "android.hardware.power@1.3.vndk.29.arm.vendor",
-        "android.hardware.radio.config@1.0.vndk.29.arm.vendor",
-        "android.hardware.radio.config@1.1.vndk.29.arm.vendor",
-        "android.hardware.radio.config@1.2.vndk.29.arm.vendor",
-        "android.hardware.radio.deprecated@1.0.vndk.29.arm.vendor",
-        "android.hardware.radio@1.0.vndk.29.arm.vendor",
-        "android.hardware.radio@1.1.vndk.29.arm.vendor",
-        "android.hardware.radio@1.2.vndk.29.arm.vendor",
-        "android.hardware.radio@1.3.vndk.29.arm.vendor",
-        "android.hardware.radio@1.4.vndk.29.arm.vendor",
-        "android.hardware.secure_element@1.0.vndk.29.arm.vendor",
-        "android.hardware.secure_element@1.1.vndk.29.arm.vendor",
-        "android.hardware.sensors@1.0.vndk.29.arm.vendor",
-        "android.hardware.sensors@2.0.vndk.29.arm.vendor",
-        "android.hardware.soundtrigger@2.0.vndk.29.arm.vendor",
-        "android.hardware.soundtrigger@2.0-core.vndk.29.arm.vendor",
-        "android.hardware.soundtrigger@2.1.vndk.29.arm.vendor",
-        "android.hardware.soundtrigger@2.2.vndk.29.arm.vendor",
-        "android.hardware.tetheroffload.config@1.0.vndk.29.arm.vendor",
-        "android.hardware.tetheroffload.control@1.0.vndk.29.arm.vendor",
-        "android.hardware.thermal@1.0.vndk.29.arm.vendor",
-        "android.hardware.thermal@1.1.vndk.29.arm.vendor",
-        "android.hardware.thermal@2.0.vndk.29.arm.vendor",
-        "android.hardware.tv.cec@1.0.vndk.29.arm.vendor",
-        "android.hardware.tv.cec@2.0.vndk.29.arm.vendor",
-        "android.hardware.tv.input@1.0.vndk.29.arm.vendor",
-        "android.hardware.usb.gadget@1.0.vndk.29.arm.vendor",
-        "android.hardware.usb@1.0.vndk.29.arm.vendor",
-        "android.hardware.usb@1.1.vndk.29.arm.vendor",
-        "android.hardware.usb@1.2.vndk.29.arm.vendor",
-        "android.hardware.vibrator@1.0.vndk.29.arm.vendor",
-        "android.hardware.vibrator@1.1.vndk.29.arm.vendor",
-        "android.hardware.vibrator@1.2.vndk.29.arm.vendor",
-        "android.hardware.vibrator@1.3.vndk.29.arm.vendor",
-        "android.hardware.vr@1.0.vndk.29.arm.vendor",
-        "android.hardware.weaver@1.0.vndk.29.arm.vendor",
-        "android.hardware.wifi.hostapd@1.0.vndk.29.arm.vendor",
-        "android.hardware.wifi.hostapd@1.1.vndk.29.arm.vendor",
-        "android.hardware.wifi.offload@1.0.vndk.29.arm.vendor",
-        "android.hardware.wifi.supplicant@1.0.vndk.29.arm.vendor",
-        "android.hardware.wifi.supplicant@1.1.vndk.29.arm.vendor",
-        "android.hardware.wifi.supplicant@1.2.vndk.29.arm.vendor",
-        "android.hardware.wifi@1.0.vndk.29.arm.vendor",
-        "android.hardware.wifi@1.1.vndk.29.arm.vendor",
-        "android.hardware.wifi@1.2.vndk.29.arm.vendor",
-        "android.hardware.wifi@1.3.vndk.29.arm.vendor",
-        "android.hidl.allocator@1.0.vndk.29.arm.vendor",
-        "android.hidl.memory.block@1.0.vndk.29.arm.vendor",
-        "android.hidl.token@1.0.vndk.29.arm.vendor",
-        "android.hidl.token@1.0-utils.vndk.29.arm.vendor",
-        "android.system.net.netd@1.0.vndk.29.arm.vendor",
-        "android.system.net.netd@1.1.vndk.29.arm.vendor",
-        "android.system.suspend@1.0.vndk.29.arm.vendor",
-        "android.system.wifi.keystore@1.0.vndk.29.arm.vendor",
-        "libadf.vndk.29.arm.vendor",
-        "libaudioroute.vndk.29.arm.vendor",
-        "libaudioutils.vndk.29.arm.vendor",
-        "libbinder.vndk.29.arm.vendor",
-        "libcamera_metadata.vndk.29.arm.vendor",
-        "libcap.vndk.29.arm.vendor",
-        "libclang_rt.scudo-arm-android.vndk.29.arm.vendor",
-        "libclang_rt.scudo_minimal-arm-android.vndk.29.arm.vendor",
-        "libclang_rt.ubsan_minimal-arm-android.vndk.29.arm.vendor",
-        "libclang_rt.ubsan_standalone-arm-android.vndk.29.arm.vendor",
-        "libcn-cbor.vndk.29.arm.vendor",
-        "libcodec2.vndk.29.arm.vendor",
-        "libcrypto.vndk.29.arm.vendor",
-        "libcrypto_utils.vndk.29.arm.vendor",
-        "libcurl.vndk.29.arm.vendor",
-        "libdiskconfig.vndk.29.arm.vendor",
-        "libdumpstateutil.vndk.29.arm.vendor",
-        "libevent.vndk.29.arm.vendor",
-        "libexif.vndk.29.arm.vendor",
-        "libexpat.vndk.29.arm.vendor",
-        "libfmq.vndk.29.arm.vendor",
-        "libgatekeeper.vndk.29.arm.vendor",
-        "libgui.vndk.29.arm.vendor",
-        "libhardware_legacy.vndk.29.arm.vendor",
-        "libhidlallocatorutils.vndk.29.arm.vendor",
-        "libhidlcache.vndk.29.arm.vendor",
-        "libjpeg.vndk.29.arm.vendor",
-        "libkeymaster_messages.vndk.29.arm.vendor",
-        "libkeymaster_portable.vndk.29.arm.vendor",
-        "libldacBT_abr.vndk.29.arm.vendor",
-        "libldacBT_enc.vndk.29.arm.vendor",
-        "liblz4.vndk.29.arm.vendor",
-        "libmedia_helper.vndk.29.arm.vendor",
-        "libmedia_omx.vndk.29.arm.vendor",
-        "libmemtrack.vndk.29.arm.vendor",
-        "libminijail.vndk.29.arm.vendor",
-        "libmkbootimg_abi_check.vndk.29.arm.vendor",
-        "libnetutils.vndk.29.arm.vendor",
-        "libnl.vndk.29.arm.vendor",
-        "libpcre2.vndk.29.arm.vendor",
-        "libpiex.vndk.29.arm.vendor",
-        "libpng.vndk.29.arm.vendor",
-        "libpower.vndk.29.arm.vendor",
-        "libprocinfo.vndk.29.arm.vendor",
-        "libprotobuf-cpp-full.vndk.29.arm.vendor",
-        "libprotobuf-cpp-lite.vndk.29.arm.vendor",
-        "libpuresoftkeymasterdevice.vndk.29.arm.vendor",
-        "libradio_metadata.vndk.29.arm.vendor",
-        "libselinux.vndk.29.arm.vendor",
-        "libsoftkeymasterdevice.vndk.29.arm.vendor",
-        "libspeexresampler.vndk.29.arm.vendor",
-        "libsqlite.vndk.29.arm.vendor",
-        "libssl.vndk.29.arm.vendor",
-        "libstagefright_bufferpool@2.0.vndk.29.arm.vendor",
-        "libstagefright_bufferqueue_helper.vndk.29.arm.vendor",
-        "libstagefright_foundation.vndk.29.arm.vendor",
-        "libstagefright_omx.vndk.29.arm.vendor",
-        "libstagefright_omx_utils.vndk.29.arm.vendor",
-        "libstagefright_xmlparser.vndk.29.arm.vendor",
-        "libsysutils.vndk.29.arm.vendor",
-        "libtinyalsa.vndk.29.arm.vendor",
-        "libtinyxml2.vndk.29.arm.vendor",
-        "libui.vndk.29.arm.vendor",
-        "libusbhost.vndk.29.arm.vendor",
-        "libwifi-system-iface.vndk.29.arm.vendor",
-        "libxml2.vndk.29.arm.vendor",
-        "libyuv.vndk.29.arm.vendor",
-        "libziparchive.vndk.29.arm.vendor",
-        "android.hardware.graphics.common@1.0.vndk.29.arm.vendor",
-        "android.hardware.graphics.common@1.1.vndk.29.arm.vendor",
-        "android.hardware.graphics.common@1.2.vndk.29.arm.vendor",
-        "android.hardware.graphics.mapper@2.0.vndk.29.arm.vendor",
-        "android.hardware.graphics.mapper@2.1.vndk.29.arm.vendor",
-        "android.hardware.graphics.mapper@3.0.vndk.29.arm.vendor",
-        "android.hardware.renderscript@1.0.vndk.29.arm.vendor",
-        "android.hidl.memory.token@1.0.vndk.29.arm.vendor",
-        "android.hidl.memory@1.0.vndk.29.arm.vendor",
-        "android.hidl.memory@1.0-impl.vndk.29.arm.vendor",
-        "android.hidl.safe_union@1.0.vndk.29.arm.vendor",
-        "libRSCpuRef.vndk.29.arm.vendor",
-        "libRSDriver.vndk.29.arm.vendor",
-        "libRS_internal.vndk.29.arm.vendor",
-        "libbacktrace.vndk.29.arm.vendor",
-        "libbase.vndk.29.arm.vendor",
-        "libbcinfo.vndk.29.arm.vendor",
-        "libbinderthreadstate.vndk.29.arm.vendor",
-        "libblas.vndk.29.arm.vendor",
-        "libc++.vndk.29.arm.vendor",
-        "libcompiler_rt.vndk.29.arm.vendor",
-        "libcutils.vndk.29.arm.vendor",
-        "libhardware.vndk.29.arm.vendor",
-        "libhidlbase.vndk.29.arm.vendor",
-        "libhidlmemory.vndk.29.arm.vendor",
-        "libhidltransport.vndk.29.arm.vendor",
-        "libhwbinder.vndk.29.arm.vendor",
-        "libhwbinder_noltopgo.vndk.29.arm.vendor",
-        "libion.vndk.29.arm.vendor",
-        "libjsoncpp.vndk.29.arm.vendor",
-        "liblzma.vndk.29.arm.vendor",
-        "libprocessgroup.vndk.29.arm.vendor",
-        "libunwindstack.vndk.29.arm.vendor",
-        "libutils.vndk.29.arm.vendor",
-        "libutilscallstack.vndk.29.arm.vendor",
-        "libz.vndk.29.arm.vendor",
-        "ld.config.29.txt",
-        "llndk.libraries.29.txt",
-        "vndksp.libraries.29.txt",
-        "vndkcore.libraries.29.txt",
-        "vndkprivate.libraries.29.txt",
-    ],
-}
-
 vndk_prebuilt_shared {
     name: "android.frameworks.cameraservice.common@2.0",
     version: "29",
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
index a51f641..f87dd0a 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -1,270 +1,6 @@
 // THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
 // DO NOT EDIT
 
-phony {
-    name: "vndk_v29_arm_binder32",
-    required: [
-        "android.frameworks.cameraservice.common@2.0.vndk.29.arm.binder32.vendor",
-        "android.frameworks.cameraservice.device@2.0.vndk.29.arm.binder32.vendor",
-        "android.frameworks.cameraservice.service@2.0.vndk.29.arm.binder32.vendor",
-        "android.frameworks.displayservice@1.0.vndk.29.arm.binder32.vendor",
-        "android.frameworks.schedulerservice@1.0.vndk.29.arm.binder32.vendor",
-        "android.frameworks.sensorservice@1.0.vndk.29.arm.binder32.vendor",
-        "android.frameworks.stats@1.0.vndk.29.arm.binder32.vendor",
-        "android.frameworks.vr.composer@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.atrace@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio.common@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio.common@4.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio.common@5.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio.effect@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio.effect@4.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio.effect@5.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio@4.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.audio@5.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.authsecret@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.automotive.audiocontrol@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.automotive.evs@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.automotive.vehicle@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.biometrics.face@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.biometrics.fingerprint@2.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.bluetooth.a2dp@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.bluetooth.audio@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.bluetooth@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.boot@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.broadcastradio@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.broadcastradio@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.broadcastradio@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.common@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.device@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.device@3.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.device@3.3.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.device@3.4.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.device@3.5.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.metadata@3.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.metadata@3.3.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.metadata@3.4.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.provider@2.4.vndk.29.arm.binder32.vendor",
-        "android.hardware.camera.provider@2.5.vndk.29.arm.binder32.vendor",
-        "android.hardware.cas.native@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.cas@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.cas@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.configstore-utils.vndk.29.arm.binder32.vendor",
-        "android.hardware.configstore@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.configstore@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.confirmationui-support-lib.vndk.29.arm.binder32.vendor",
-        "android.hardware.confirmationui@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.contexthub@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.drm@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.drm@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.drm@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.dumpstate@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.fastboot@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.gatekeeper@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.gnss.visibility_control@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.gnss@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.gnss@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.gnss@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.allocator@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.allocator@3.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.bufferqueue@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.bufferqueue@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.composer@2.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.composer@2.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.composer@2.3.vndk.29.arm.binder32.vendor",
-        "android.hardware.health.storage@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.health@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.health@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.input.classifier@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.input.common@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.ir@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.keymaster@3.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.keymaster@4.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.light@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.media.bufferpool@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.media.bufferpool@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.media.c2@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.media.omx@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.media@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.memtrack@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.neuralnetworks@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.neuralnetworks@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.neuralnetworks@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.nfc@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.nfc@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.nfc@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.oemlock@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.power.stats@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.power@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.power@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.power@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.power@1.3.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio.config@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio.config@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio.config@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio.deprecated@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio@1.3.vndk.29.arm.binder32.vendor",
-        "android.hardware.radio@1.4.vndk.29.arm.binder32.vendor",
-        "android.hardware.secure_element@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.secure_element@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.sensors@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.sensors@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.soundtrigger@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.soundtrigger@2.0-core.vndk.29.arm.binder32.vendor",
-        "android.hardware.soundtrigger@2.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.soundtrigger@2.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.tetheroffload.config@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.tetheroffload.control@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.thermal@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.thermal@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.thermal@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.tv.cec@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.tv.cec@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.tv.input@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.usb.gadget@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.usb@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.usb@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.usb@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.vibrator@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.vibrator@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.vibrator@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.vibrator@1.3.vndk.29.arm.binder32.vendor",
-        "android.hardware.vr@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.weaver@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi.hostapd@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi.hostapd@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi.offload@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi.supplicant@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi.supplicant@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi.supplicant@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.wifi@1.3.vndk.29.arm.binder32.vendor",
-        "android.hidl.allocator@1.0.vndk.29.arm.binder32.vendor",
-        "android.hidl.memory.block@1.0.vndk.29.arm.binder32.vendor",
-        "android.hidl.token@1.0.vndk.29.arm.binder32.vendor",
-        "android.hidl.token@1.0-utils.vndk.29.arm.binder32.vendor",
-        "android.system.net.netd@1.0.vndk.29.arm.binder32.vendor",
-        "android.system.net.netd@1.1.vndk.29.arm.binder32.vendor",
-        "android.system.suspend@1.0.vndk.29.arm.binder32.vendor",
-        "android.system.wifi.keystore@1.0.vndk.29.arm.binder32.vendor",
-        "libadf.vndk.29.arm.binder32.vendor",
-        "libaudioroute.vndk.29.arm.binder32.vendor",
-        "libaudioutils.vndk.29.arm.binder32.vendor",
-        "libbinder.vndk.29.arm.binder32.vendor",
-        "libcamera_metadata.vndk.29.arm.binder32.vendor",
-        "libcap.vndk.29.arm.binder32.vendor",
-        "libclang_rt.scudo-arm-android.vndk.29.arm.binder32.vendor",
-        "libclang_rt.scudo_minimal-arm-android.vndk.29.arm.binder32.vendor",
-        "libclang_rt.ubsan_minimal-arm-android.vndk.29.arm.binder32.vendor",
-        "libclang_rt.ubsan_standalone-arm-android.vndk.29.arm.binder32.vendor",
-        "libcn-cbor.vndk.29.arm.binder32.vendor",
-        "libcodec2.vndk.29.arm.binder32.vendor",
-        "libcrypto.vndk.29.arm.binder32.vendor",
-        "libcrypto_utils.vndk.29.arm.binder32.vendor",
-        "libcurl.vndk.29.arm.binder32.vendor",
-        "libdiskconfig.vndk.29.arm.binder32.vendor",
-        "libdumpstateutil.vndk.29.arm.binder32.vendor",
-        "libevent.vndk.29.arm.binder32.vendor",
-        "libexif.vndk.29.arm.binder32.vendor",
-        "libexpat.vndk.29.arm.binder32.vendor",
-        "libfmq.vndk.29.arm.binder32.vendor",
-        "libgatekeeper.vndk.29.arm.binder32.vendor",
-        "libgui.vndk.29.arm.binder32.vendor",
-        "libhardware_legacy.vndk.29.arm.binder32.vendor",
-        "libhidlallocatorutils.vndk.29.arm.binder32.vendor",
-        "libhidlcache.vndk.29.arm.binder32.vendor",
-        "libjpeg.vndk.29.arm.binder32.vendor",
-        "libkeymaster_messages.vndk.29.arm.binder32.vendor",
-        "libkeymaster_portable.vndk.29.arm.binder32.vendor",
-        "libldacBT_abr.vndk.29.arm.binder32.vendor",
-        "libldacBT_enc.vndk.29.arm.binder32.vendor",
-        "liblz4.vndk.29.arm.binder32.vendor",
-        "libmedia_helper.vndk.29.arm.binder32.vendor",
-        "libmedia_omx.vndk.29.arm.binder32.vendor",
-        "libmemtrack.vndk.29.arm.binder32.vendor",
-        "libminijail.vndk.29.arm.binder32.vendor",
-        "libmkbootimg_abi_check.vndk.29.arm.binder32.vendor",
-        "libnetutils.vndk.29.arm.binder32.vendor",
-        "libnl.vndk.29.arm.binder32.vendor",
-        "libpcre2.vndk.29.arm.binder32.vendor",
-        "libpiex.vndk.29.arm.binder32.vendor",
-        "libpng.vndk.29.arm.binder32.vendor",
-        "libpower.vndk.29.arm.binder32.vendor",
-        "libprocinfo.vndk.29.arm.binder32.vendor",
-        "libprotobuf-cpp-full.vndk.29.arm.binder32.vendor",
-        "libprotobuf-cpp-lite.vndk.29.arm.binder32.vendor",
-        "libpuresoftkeymasterdevice.vndk.29.arm.binder32.vendor",
-        "libradio_metadata.vndk.29.arm.binder32.vendor",
-        "libselinux.vndk.29.arm.binder32.vendor",
-        "libsoftkeymasterdevice.vndk.29.arm.binder32.vendor",
-        "libspeexresampler.vndk.29.arm.binder32.vendor",
-        "libsqlite.vndk.29.arm.binder32.vendor",
-        "libssl.vndk.29.arm.binder32.vendor",
-        "libstagefright_bufferpool@2.0.vndk.29.arm.binder32.vendor",
-        "libstagefright_bufferqueue_helper.vndk.29.arm.binder32.vendor",
-        "libstagefright_foundation.vndk.29.arm.binder32.vendor",
-        "libstagefright_omx.vndk.29.arm.binder32.vendor",
-        "libstagefright_omx_utils.vndk.29.arm.binder32.vendor",
-        "libstagefright_xmlparser.vndk.29.arm.binder32.vendor",
-        "libsysutils.vndk.29.arm.binder32.vendor",
-        "libtinyalsa.vndk.29.arm.binder32.vendor",
-        "libtinyxml2.vndk.29.arm.binder32.vendor",
-        "libui.vndk.29.arm.binder32.vendor",
-        "libusbhost.vndk.29.arm.binder32.vendor",
-        "libwifi-system-iface.vndk.29.arm.binder32.vendor",
-        "libxml2.vndk.29.arm.binder32.vendor",
-        "libyuv.vndk.29.arm.binder32.vendor",
-        "libziparchive.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.common@1.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.common@1.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.common@1.2.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.mapper@2.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.mapper@2.1.vndk.29.arm.binder32.vendor",
-        "android.hardware.graphics.mapper@3.0.vndk.29.arm.binder32.vendor",
-        "android.hardware.renderscript@1.0.vndk.29.arm.binder32.vendor",
-        "android.hidl.memory.token@1.0.vndk.29.arm.binder32.vendor",
-        "android.hidl.memory@1.0.vndk.29.arm.binder32.vendor",
-        "android.hidl.memory@1.0-impl.vndk.29.arm.binder32.vendor",
-        "android.hidl.safe_union@1.0.vndk.29.arm.binder32.vendor",
-        "libRSCpuRef.vndk.29.arm.binder32.vendor",
-        "libRSDriver.vndk.29.arm.binder32.vendor",
-        "libRS_internal.vndk.29.arm.binder32.vendor",
-        "libbacktrace.vndk.29.arm.binder32.vendor",
-        "libbase.vndk.29.arm.binder32.vendor",
-        "libbcinfo.vndk.29.arm.binder32.vendor",
-        "libbinderthreadstate.vndk.29.arm.binder32.vendor",
-        "libblas.vndk.29.arm.binder32.vendor",
-        "libc++.vndk.29.arm.binder32.vendor",
-        "libcompiler_rt.vndk.29.arm.binder32.vendor",
-        "libcutils.vndk.29.arm.binder32.vendor",
-        "libhardware.vndk.29.arm.binder32.vendor",
-        "libhidlbase.vndk.29.arm.binder32.vendor",
-        "libhidlmemory.vndk.29.arm.binder32.vendor",
-        "libhidltransport.vndk.29.arm.binder32.vendor",
-        "libhwbinder.vndk.29.arm.binder32.vendor",
-        "libhwbinder_noltopgo.vndk.29.arm.binder32.vendor",
-        "libion.vndk.29.arm.binder32.vendor",
-        "libjsoncpp.vndk.29.arm.binder32.vendor",
-        "liblzma.vndk.29.arm.binder32.vendor",
-        "libprocessgroup.vndk.29.arm.binder32.vendor",
-        "libunwindstack.vndk.29.arm.binder32.vendor",
-        "libutils.vndk.29.arm.binder32.vendor",
-        "libutilscallstack.vndk.29.arm.binder32.vendor",
-        "libz.vndk.29.arm.binder32.vendor",
-        "ld.config.29.txt",
-        "llndk.libraries.29.txt",
-        "vndksp.libraries.29.txt",
-        "vndkcore.libraries.29.txt",
-        "vndkprivate.libraries.29.txt",
-    ],
-}
-
 vndk_prebuilt_shared {
     name: "android.frameworks.cameraservice.common@2.0",
     version: "29",
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 440f324..d417396 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -1,274 +1,6 @@
 // THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
 // DO NOT EDIT
 
-phony {
-    name: "vndk_v29_arm64",
-    required: [
-        "android.frameworks.cameraservice.common@2.0.vndk.29.arm64.vendor",
-        "android.frameworks.cameraservice.device@2.0.vndk.29.arm64.vendor",
-        "android.frameworks.cameraservice.service@2.0.vndk.29.arm64.vendor",
-        "android.frameworks.displayservice@1.0.vndk.29.arm64.vendor",
-        "android.frameworks.schedulerservice@1.0.vndk.29.arm64.vendor",
-        "android.frameworks.sensorservice@1.0.vndk.29.arm64.vendor",
-        "android.frameworks.stats@1.0.vndk.29.arm64.vendor",
-        "android.frameworks.vr.composer@1.0.vndk.29.arm64.vendor",
-        "android.hardware.atrace@1.0.vndk.29.arm64.vendor",
-        "android.hardware.audio.common@2.0.vndk.29.arm64.vendor",
-        "android.hardware.audio.common@4.0.vndk.29.arm64.vendor",
-        "android.hardware.audio.common@5.0.vndk.29.arm64.vendor",
-        "android.hardware.audio.effect@2.0.vndk.29.arm64.vendor",
-        "android.hardware.audio.effect@4.0.vndk.29.arm64.vendor",
-        "android.hardware.audio.effect@5.0.vndk.29.arm64.vendor",
-        "android.hardware.audio@2.0.vndk.29.arm64.vendor",
-        "android.hardware.audio@4.0.vndk.29.arm64.vendor",
-        "android.hardware.audio@5.0.vndk.29.arm64.vendor",
-        "android.hardware.authsecret@1.0.vndk.29.arm64.vendor",
-        "android.hardware.automotive.audiocontrol@1.0.vndk.29.arm64.vendor",
-        "android.hardware.automotive.evs@1.0.vndk.29.arm64.vendor",
-        "android.hardware.automotive.vehicle@2.0.vndk.29.arm64.vendor",
-        "android.hardware.biometrics.face@1.0.vndk.29.arm64.vendor",
-        "android.hardware.biometrics.fingerprint@2.1.vndk.29.arm64.vendor",
-        "android.hardware.bluetooth.a2dp@1.0.vndk.29.arm64.vendor",
-        "android.hardware.bluetooth.audio@2.0.vndk.29.arm64.vendor",
-        "android.hardware.bluetooth@1.0.vndk.29.arm64.vendor",
-        "android.hardware.boot@1.0.vndk.29.arm64.vendor",
-        "android.hardware.broadcastradio@1.0.vndk.29.arm64.vendor",
-        "android.hardware.broadcastradio@1.1.vndk.29.arm64.vendor",
-        "android.hardware.broadcastradio@2.0.vndk.29.arm64.vendor",
-        "android.hardware.camera.common@1.0.vndk.29.arm64.vendor",
-        "android.hardware.camera.device@1.0.vndk.29.arm64.vendor",
-        "android.hardware.camera.device@3.2.vndk.29.arm64.vendor",
-        "android.hardware.camera.device@3.3.vndk.29.arm64.vendor",
-        "android.hardware.camera.device@3.4.vndk.29.arm64.vendor",
-        "android.hardware.camera.device@3.5.vndk.29.arm64.vendor",
-        "android.hardware.camera.metadata@3.2.vndk.29.arm64.vendor",
-        "android.hardware.camera.metadata@3.3.vndk.29.arm64.vendor",
-        "android.hardware.camera.metadata@3.4.vndk.29.arm64.vendor",
-        "android.hardware.camera.provider@2.4.vndk.29.arm64.vendor",
-        "android.hardware.camera.provider@2.5.vndk.29.arm64.vendor",
-        "android.hardware.cas.native@1.0.vndk.29.arm64.vendor",
-        "android.hardware.cas@1.0.vndk.29.arm64.vendor",
-        "android.hardware.cas@1.1.vndk.29.arm64.vendor",
-        "android.hardware.configstore-utils.vndk.29.arm64.vendor",
-        "android.hardware.configstore@1.0.vndk.29.arm64.vendor",
-        "android.hardware.configstore@1.1.vndk.29.arm64.vendor",
-        "android.hardware.confirmationui-support-lib.vndk.29.arm64.vendor",
-        "android.hardware.confirmationui@1.0.vndk.29.arm64.vendor",
-        "android.hardware.contexthub@1.0.vndk.29.arm64.vendor",
-        "android.hardware.drm@1.0.vndk.29.arm64.vendor",
-        "android.hardware.drm@1.1.vndk.29.arm64.vendor",
-        "android.hardware.drm@1.2.vndk.29.arm64.vendor",
-        "android.hardware.dumpstate@1.0.vndk.29.arm64.vendor",
-        "android.hardware.fastboot@1.0.vndk.29.arm64.vendor",
-        "android.hardware.gatekeeper@1.0.vndk.29.arm64.vendor",
-        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.arm64.vendor",
-        "android.hardware.gnss.visibility_control@1.0.vndk.29.arm64.vendor",
-        "android.hardware.gnss@1.0.vndk.29.arm64.vendor",
-        "android.hardware.gnss@1.1.vndk.29.arm64.vendor",
-        "android.hardware.gnss@2.0.vndk.29.arm64.vendor",
-        "android.hardware.graphics.allocator@2.0.vndk.29.arm64.vendor",
-        "android.hardware.graphics.allocator@3.0.vndk.29.arm64.vendor",
-        "android.hardware.graphics.bufferqueue@1.0.vndk.29.arm64.vendor",
-        "android.hardware.graphics.bufferqueue@2.0.vndk.29.arm64.vendor",
-        "android.hardware.graphics.composer@2.1.vndk.29.arm64.vendor",
-        "android.hardware.graphics.composer@2.2.vndk.29.arm64.vendor",
-        "android.hardware.graphics.composer@2.3.vndk.29.arm64.vendor",
-        "android.hardware.health.storage@1.0.vndk.29.arm64.vendor",
-        "android.hardware.health@1.0.vndk.29.arm64.vendor",
-        "android.hardware.health@2.0.vndk.29.arm64.vendor",
-        "android.hardware.input.classifier@1.0.vndk.29.arm64.vendor",
-        "android.hardware.input.common@1.0.vndk.29.arm64.vendor",
-        "android.hardware.ir@1.0.vndk.29.arm64.vendor",
-        "android.hardware.keymaster@3.0.vndk.29.arm64.vendor",
-        "android.hardware.keymaster@4.0.vndk.29.arm64.vendor",
-        "android.hardware.light@2.0.vndk.29.arm64.vendor",
-        "android.hardware.media.bufferpool@1.0.vndk.29.arm64.vendor",
-        "android.hardware.media.bufferpool@2.0.vndk.29.arm64.vendor",
-        "android.hardware.media.c2@1.0.vndk.29.arm64.vendor",
-        "android.hardware.media.omx@1.0.vndk.29.arm64.vendor",
-        "android.hardware.media@1.0.vndk.29.arm64.vendor",
-        "android.hardware.memtrack@1.0.vndk.29.arm64.vendor",
-        "android.hardware.neuralnetworks@1.0.vndk.29.arm64.vendor",
-        "android.hardware.neuralnetworks@1.1.vndk.29.arm64.vendor",
-        "android.hardware.neuralnetworks@1.2.vndk.29.arm64.vendor",
-        "android.hardware.nfc@1.0.vndk.29.arm64.vendor",
-        "android.hardware.nfc@1.1.vndk.29.arm64.vendor",
-        "android.hardware.nfc@1.2.vndk.29.arm64.vendor",
-        "android.hardware.oemlock@1.0.vndk.29.arm64.vendor",
-        "android.hardware.power.stats@1.0.vndk.29.arm64.vendor",
-        "android.hardware.power@1.0.vndk.29.arm64.vendor",
-        "android.hardware.power@1.1.vndk.29.arm64.vendor",
-        "android.hardware.power@1.2.vndk.29.arm64.vendor",
-        "android.hardware.power@1.3.vndk.29.arm64.vendor",
-        "android.hardware.radio.config@1.0.vndk.29.arm64.vendor",
-        "android.hardware.radio.config@1.1.vndk.29.arm64.vendor",
-        "android.hardware.radio.config@1.2.vndk.29.arm64.vendor",
-        "android.hardware.radio.deprecated@1.0.vndk.29.arm64.vendor",
-        "android.hardware.radio@1.0.vndk.29.arm64.vendor",
-        "android.hardware.radio@1.1.vndk.29.arm64.vendor",
-        "android.hardware.radio@1.2.vndk.29.arm64.vendor",
-        "android.hardware.radio@1.3.vndk.29.arm64.vendor",
-        "android.hardware.radio@1.4.vndk.29.arm64.vendor",
-        "android.hardware.secure_element@1.0.vndk.29.arm64.vendor",
-        "android.hardware.secure_element@1.1.vndk.29.arm64.vendor",
-        "android.hardware.sensors@1.0.vndk.29.arm64.vendor",
-        "android.hardware.sensors@2.0.vndk.29.arm64.vendor",
-        "android.hardware.soundtrigger@2.0.vndk.29.arm64.vendor",
-        "android.hardware.soundtrigger@2.0-core.vndk.29.arm64.vendor",
-        "android.hardware.soundtrigger@2.1.vndk.29.arm64.vendor",
-        "android.hardware.soundtrigger@2.2.vndk.29.arm64.vendor",
-        "android.hardware.tetheroffload.config@1.0.vndk.29.arm64.vendor",
-        "android.hardware.tetheroffload.control@1.0.vndk.29.arm64.vendor",
-        "android.hardware.thermal@1.0.vndk.29.arm64.vendor",
-        "android.hardware.thermal@1.1.vndk.29.arm64.vendor",
-        "android.hardware.thermal@2.0.vndk.29.arm64.vendor",
-        "android.hardware.tv.cec@1.0.vndk.29.arm64.vendor",
-        "android.hardware.tv.cec@2.0.vndk.29.arm64.vendor",
-        "android.hardware.tv.input@1.0.vndk.29.arm64.vendor",
-        "android.hardware.usb.gadget@1.0.vndk.29.arm64.vendor",
-        "android.hardware.usb@1.0.vndk.29.arm64.vendor",
-        "android.hardware.usb@1.1.vndk.29.arm64.vendor",
-        "android.hardware.usb@1.2.vndk.29.arm64.vendor",
-        "android.hardware.vibrator@1.0.vndk.29.arm64.vendor",
-        "android.hardware.vibrator@1.1.vndk.29.arm64.vendor",
-        "android.hardware.vibrator@1.2.vndk.29.arm64.vendor",
-        "android.hardware.vibrator@1.3.vndk.29.arm64.vendor",
-        "android.hardware.vr@1.0.vndk.29.arm64.vendor",
-        "android.hardware.weaver@1.0.vndk.29.arm64.vendor",
-        "android.hardware.wifi.hostapd@1.0.vndk.29.arm64.vendor",
-        "android.hardware.wifi.hostapd@1.1.vndk.29.arm64.vendor",
-        "android.hardware.wifi.offload@1.0.vndk.29.arm64.vendor",
-        "android.hardware.wifi.supplicant@1.0.vndk.29.arm64.vendor",
-        "android.hardware.wifi.supplicant@1.1.vndk.29.arm64.vendor",
-        "android.hardware.wifi.supplicant@1.2.vndk.29.arm64.vendor",
-        "android.hardware.wifi@1.0.vndk.29.arm64.vendor",
-        "android.hardware.wifi@1.1.vndk.29.arm64.vendor",
-        "android.hardware.wifi@1.2.vndk.29.arm64.vendor",
-        "android.hardware.wifi@1.3.vndk.29.arm64.vendor",
-        "android.hidl.allocator@1.0.vndk.29.arm64.vendor",
-        "android.hidl.memory.block@1.0.vndk.29.arm64.vendor",
-        "android.hidl.token@1.0.vndk.29.arm64.vendor",
-        "android.hidl.token@1.0-utils.vndk.29.arm64.vendor",
-        "android.system.net.netd@1.0.vndk.29.arm64.vendor",
-        "android.system.net.netd@1.1.vndk.29.arm64.vendor",
-        "android.system.suspend@1.0.vndk.29.arm64.vendor",
-        "android.system.wifi.keystore@1.0.vndk.29.arm64.vendor",
-        "libadf.vndk.29.arm64.vendor",
-        "libaudioroute.vndk.29.arm64.vendor",
-        "libaudioutils.vndk.29.arm64.vendor",
-        "libbinder.vndk.29.arm64.vendor",
-        "libcamera_metadata.vndk.29.arm64.vendor",
-        "libcap.vndk.29.arm64.vendor",
-        "libclang_rt.scudo-aarch64-android.vndk.29.arm64.vendor",
-        "libclang_rt.scudo-arm-android.vndk.29.arm64.vendor",
-        "libclang_rt.scudo_minimal-aarch64-android.vndk.29.arm64.vendor",
-        "libclang_rt.scudo_minimal-arm-android.vndk.29.arm64.vendor",
-        "libclang_rt.ubsan_minimal-aarch64-android.vndk.29.arm64.vendor",
-        "libclang_rt.ubsan_minimal-arm-android.vndk.29.arm64.vendor",
-        "libclang_rt.ubsan_standalone-aarch64-android.vndk.29.arm64.vendor",
-        "libclang_rt.ubsan_standalone-arm-android.vndk.29.arm64.vendor",
-        "libcn-cbor.vndk.29.arm64.vendor",
-        "libcodec2.vndk.29.arm64.vendor",
-        "libcrypto.vndk.29.arm64.vendor",
-        "libcrypto_utils.vndk.29.arm64.vendor",
-        "libcurl.vndk.29.arm64.vendor",
-        "libdiskconfig.vndk.29.arm64.vendor",
-        "libdumpstateutil.vndk.29.arm64.vendor",
-        "libevent.vndk.29.arm64.vendor",
-        "libexif.vndk.29.arm64.vendor",
-        "libexpat.vndk.29.arm64.vendor",
-        "libfmq.vndk.29.arm64.vendor",
-        "libgatekeeper.vndk.29.arm64.vendor",
-        "libgui.vndk.29.arm64.vendor",
-        "libhardware_legacy.vndk.29.arm64.vendor",
-        "libhidlallocatorutils.vndk.29.arm64.vendor",
-        "libhidlcache.vndk.29.arm64.vendor",
-        "libjpeg.vndk.29.arm64.vendor",
-        "libkeymaster_messages.vndk.29.arm64.vendor",
-        "libkeymaster_portable.vndk.29.arm64.vendor",
-        "libldacBT_abr.vndk.29.arm64.vendor",
-        "libldacBT_enc.vndk.29.arm64.vendor",
-        "liblz4.vndk.29.arm64.vendor",
-        "libmedia_helper.vndk.29.arm64.vendor",
-        "libmedia_omx.vndk.29.arm64.vendor",
-        "libmemtrack.vndk.29.arm64.vendor",
-        "libminijail.vndk.29.arm64.vendor",
-        "libmkbootimg_abi_check.vndk.29.arm64.vendor",
-        "libnetutils.vndk.29.arm64.vendor",
-        "libnl.vndk.29.arm64.vendor",
-        "libpcre2.vndk.29.arm64.vendor",
-        "libpiex.vndk.29.arm64.vendor",
-        "libpng.vndk.29.arm64.vendor",
-        "libpower.vndk.29.arm64.vendor",
-        "libprocinfo.vndk.29.arm64.vendor",
-        "libprotobuf-cpp-full.vndk.29.arm64.vendor",
-        "libprotobuf-cpp-lite.vndk.29.arm64.vendor",
-        "libpuresoftkeymasterdevice.vndk.29.arm64.vendor",
-        "libradio_metadata.vndk.29.arm64.vendor",
-        "libselinux.vndk.29.arm64.vendor",
-        "libsoftkeymasterdevice.vndk.29.arm64.vendor",
-        "libspeexresampler.vndk.29.arm64.vendor",
-        "libsqlite.vndk.29.arm64.vendor",
-        "libssl.vndk.29.arm64.vendor",
-        "libstagefright_bufferpool@2.0.vndk.29.arm64.vendor",
-        "libstagefright_bufferqueue_helper.vndk.29.arm64.vendor",
-        "libstagefright_foundation.vndk.29.arm64.vendor",
-        "libstagefright_omx.vndk.29.arm64.vendor",
-        "libstagefright_omx_utils.vndk.29.arm64.vendor",
-        "libstagefright_xmlparser.vndk.29.arm64.vendor",
-        "libsysutils.vndk.29.arm64.vendor",
-        "libtinyalsa.vndk.29.arm64.vendor",
-        "libtinyxml2.vndk.29.arm64.vendor",
-        "libui.vndk.29.arm64.vendor",
-        "libusbhost.vndk.29.arm64.vendor",
-        "libwifi-system-iface.vndk.29.arm64.vendor",
-        "libxml2.vndk.29.arm64.vendor",
-        "libyuv.vndk.29.arm64.vendor",
-        "libziparchive.vndk.29.arm64.vendor",
-        "android.hardware.graphics.common@1.0.vndk.29.arm64.vendor",
-        "android.hardware.graphics.common@1.1.vndk.29.arm64.vendor",
-        "android.hardware.graphics.common@1.2.vndk.29.arm64.vendor",
-        "android.hardware.graphics.mapper@2.0.vndk.29.arm64.vendor",
-        "android.hardware.graphics.mapper@2.1.vndk.29.arm64.vendor",
-        "android.hardware.graphics.mapper@3.0.vndk.29.arm64.vendor",
-        "android.hardware.renderscript@1.0.vndk.29.arm64.vendor",
-        "android.hidl.memory.token@1.0.vndk.29.arm64.vendor",
-        "android.hidl.memory@1.0.vndk.29.arm64.vendor",
-        "android.hidl.memory@1.0-impl.vndk.29.arm64.vendor",
-        "android.hidl.safe_union@1.0.vndk.29.arm64.vendor",
-        "libRSCpuRef.vndk.29.arm64.vendor",
-        "libRSDriver.vndk.29.arm64.vendor",
-        "libRS_internal.vndk.29.arm64.vendor",
-        "libbacktrace.vndk.29.arm64.vendor",
-        "libbase.vndk.29.arm64.vendor",
-        "libbcinfo.vndk.29.arm64.vendor",
-        "libbinderthreadstate.vndk.29.arm64.vendor",
-        "libblas.vndk.29.arm64.vendor",
-        "libc++.vndk.29.arm64.vendor",
-        "libcompiler_rt.vndk.29.arm64.vendor",
-        "libcutils.vndk.29.arm64.vendor",
-        "libhardware.vndk.29.arm64.vendor",
-        "libhidlbase.vndk.29.arm64.vendor",
-        "libhidlmemory.vndk.29.arm64.vendor",
-        "libhidltransport.vndk.29.arm64.vendor",
-        "libhwbinder.vndk.29.arm64.vendor",
-        "libhwbinder_noltopgo.vndk.29.arm64.vendor",
-        "libion.vndk.29.arm64.vendor",
-        "libjsoncpp.vndk.29.arm64.vendor",
-        "liblzma.vndk.29.arm64.vendor",
-        "libprocessgroup.vndk.29.arm64.vendor",
-        "libunwindstack.vndk.29.arm64.vendor",
-        "libutils.vndk.29.arm64.vendor",
-        "libutilscallstack.vndk.29.arm64.vendor",
-        "libz.vndk.29.arm64.vendor",
-        "ld.config.29.txt",
-        "llndk.libraries.29.txt",
-        "vndksp.libraries.29.txt",
-        "vndkcore.libraries.29.txt",
-        "vndkprivate.libraries.29.txt",
-    ],
-}
-
 vndk_prebuilt_shared {
     name: "android.frameworks.cameraservice.common@2.0",
     version: "29",
diff --git a/x86/Android.bp b/x86/Android.bp
index 47d0a72..b56e7b0 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1,270 +1,6 @@
 // THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
 // DO NOT EDIT
 
-phony {
-    name: "vndk_v29_x86",
-    required: [
-        "android.frameworks.cameraservice.common@2.0.vndk.29.x86.vendor",
-        "android.frameworks.cameraservice.device@2.0.vndk.29.x86.vendor",
-        "android.frameworks.cameraservice.service@2.0.vndk.29.x86.vendor",
-        "android.frameworks.displayservice@1.0.vndk.29.x86.vendor",
-        "android.frameworks.schedulerservice@1.0.vndk.29.x86.vendor",
-        "android.frameworks.sensorservice@1.0.vndk.29.x86.vendor",
-        "android.frameworks.stats@1.0.vndk.29.x86.vendor",
-        "android.frameworks.vr.composer@1.0.vndk.29.x86.vendor",
-        "android.hardware.atrace@1.0.vndk.29.x86.vendor",
-        "android.hardware.audio.common@2.0.vndk.29.x86.vendor",
-        "android.hardware.audio.common@4.0.vndk.29.x86.vendor",
-        "android.hardware.audio.common@5.0.vndk.29.x86.vendor",
-        "android.hardware.audio.effect@2.0.vndk.29.x86.vendor",
-        "android.hardware.audio.effect@4.0.vndk.29.x86.vendor",
-        "android.hardware.audio.effect@5.0.vndk.29.x86.vendor",
-        "android.hardware.audio@2.0.vndk.29.x86.vendor",
-        "android.hardware.audio@4.0.vndk.29.x86.vendor",
-        "android.hardware.audio@5.0.vndk.29.x86.vendor",
-        "android.hardware.authsecret@1.0.vndk.29.x86.vendor",
-        "android.hardware.automotive.audiocontrol@1.0.vndk.29.x86.vendor",
-        "android.hardware.automotive.evs@1.0.vndk.29.x86.vendor",
-        "android.hardware.automotive.vehicle@2.0.vndk.29.x86.vendor",
-        "android.hardware.biometrics.face@1.0.vndk.29.x86.vendor",
-        "android.hardware.biometrics.fingerprint@2.1.vndk.29.x86.vendor",
-        "android.hardware.bluetooth.a2dp@1.0.vndk.29.x86.vendor",
-        "android.hardware.bluetooth.audio@2.0.vndk.29.x86.vendor",
-        "android.hardware.bluetooth@1.0.vndk.29.x86.vendor",
-        "android.hardware.boot@1.0.vndk.29.x86.vendor",
-        "android.hardware.broadcastradio@1.0.vndk.29.x86.vendor",
-        "android.hardware.broadcastradio@1.1.vndk.29.x86.vendor",
-        "android.hardware.broadcastradio@2.0.vndk.29.x86.vendor",
-        "android.hardware.camera.common@1.0.vndk.29.x86.vendor",
-        "android.hardware.camera.device@1.0.vndk.29.x86.vendor",
-        "android.hardware.camera.device@3.2.vndk.29.x86.vendor",
-        "android.hardware.camera.device@3.3.vndk.29.x86.vendor",
-        "android.hardware.camera.device@3.4.vndk.29.x86.vendor",
-        "android.hardware.camera.device@3.5.vndk.29.x86.vendor",
-        "android.hardware.camera.metadata@3.2.vndk.29.x86.vendor",
-        "android.hardware.camera.metadata@3.3.vndk.29.x86.vendor",
-        "android.hardware.camera.metadata@3.4.vndk.29.x86.vendor",
-        "android.hardware.camera.provider@2.4.vndk.29.x86.vendor",
-        "android.hardware.camera.provider@2.5.vndk.29.x86.vendor",
-        "android.hardware.cas.native@1.0.vndk.29.x86.vendor",
-        "android.hardware.cas@1.0.vndk.29.x86.vendor",
-        "android.hardware.cas@1.1.vndk.29.x86.vendor",
-        "android.hardware.configstore-utils.vndk.29.x86.vendor",
-        "android.hardware.configstore@1.0.vndk.29.x86.vendor",
-        "android.hardware.configstore@1.1.vndk.29.x86.vendor",
-        "android.hardware.confirmationui-support-lib.vndk.29.x86.vendor",
-        "android.hardware.confirmationui@1.0.vndk.29.x86.vendor",
-        "android.hardware.contexthub@1.0.vndk.29.x86.vendor",
-        "android.hardware.drm@1.0.vndk.29.x86.vendor",
-        "android.hardware.drm@1.1.vndk.29.x86.vendor",
-        "android.hardware.drm@1.2.vndk.29.x86.vendor",
-        "android.hardware.dumpstate@1.0.vndk.29.x86.vendor",
-        "android.hardware.fastboot@1.0.vndk.29.x86.vendor",
-        "android.hardware.gatekeeper@1.0.vndk.29.x86.vendor",
-        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.x86.vendor",
-        "android.hardware.gnss.visibility_control@1.0.vndk.29.x86.vendor",
-        "android.hardware.gnss@1.0.vndk.29.x86.vendor",
-        "android.hardware.gnss@1.1.vndk.29.x86.vendor",
-        "android.hardware.gnss@2.0.vndk.29.x86.vendor",
-        "android.hardware.graphics.allocator@2.0.vndk.29.x86.vendor",
-        "android.hardware.graphics.allocator@3.0.vndk.29.x86.vendor",
-        "android.hardware.graphics.bufferqueue@1.0.vndk.29.x86.vendor",
-        "android.hardware.graphics.bufferqueue@2.0.vndk.29.x86.vendor",
-        "android.hardware.graphics.composer@2.1.vndk.29.x86.vendor",
-        "android.hardware.graphics.composer@2.2.vndk.29.x86.vendor",
-        "android.hardware.graphics.composer@2.3.vndk.29.x86.vendor",
-        "android.hardware.health.storage@1.0.vndk.29.x86.vendor",
-        "android.hardware.health@1.0.vndk.29.x86.vendor",
-        "android.hardware.health@2.0.vndk.29.x86.vendor",
-        "android.hardware.input.classifier@1.0.vndk.29.x86.vendor",
-        "android.hardware.input.common@1.0.vndk.29.x86.vendor",
-        "android.hardware.ir@1.0.vndk.29.x86.vendor",
-        "android.hardware.keymaster@3.0.vndk.29.x86.vendor",
-        "android.hardware.keymaster@4.0.vndk.29.x86.vendor",
-        "android.hardware.light@2.0.vndk.29.x86.vendor",
-        "android.hardware.media.bufferpool@1.0.vndk.29.x86.vendor",
-        "android.hardware.media.bufferpool@2.0.vndk.29.x86.vendor",
-        "android.hardware.media.c2@1.0.vndk.29.x86.vendor",
-        "android.hardware.media.omx@1.0.vndk.29.x86.vendor",
-        "android.hardware.media@1.0.vndk.29.x86.vendor",
-        "android.hardware.memtrack@1.0.vndk.29.x86.vendor",
-        "android.hardware.neuralnetworks@1.0.vndk.29.x86.vendor",
-        "android.hardware.neuralnetworks@1.1.vndk.29.x86.vendor",
-        "android.hardware.neuralnetworks@1.2.vndk.29.x86.vendor",
-        "android.hardware.nfc@1.0.vndk.29.x86.vendor",
-        "android.hardware.nfc@1.1.vndk.29.x86.vendor",
-        "android.hardware.nfc@1.2.vndk.29.x86.vendor",
-        "android.hardware.oemlock@1.0.vndk.29.x86.vendor",
-        "android.hardware.power.stats@1.0.vndk.29.x86.vendor",
-        "android.hardware.power@1.0.vndk.29.x86.vendor",
-        "android.hardware.power@1.1.vndk.29.x86.vendor",
-        "android.hardware.power@1.2.vndk.29.x86.vendor",
-        "android.hardware.power@1.3.vndk.29.x86.vendor",
-        "android.hardware.radio.config@1.0.vndk.29.x86.vendor",
-        "android.hardware.radio.config@1.1.vndk.29.x86.vendor",
-        "android.hardware.radio.config@1.2.vndk.29.x86.vendor",
-        "android.hardware.radio.deprecated@1.0.vndk.29.x86.vendor",
-        "android.hardware.radio@1.0.vndk.29.x86.vendor",
-        "android.hardware.radio@1.1.vndk.29.x86.vendor",
-        "android.hardware.radio@1.2.vndk.29.x86.vendor",
-        "android.hardware.radio@1.3.vndk.29.x86.vendor",
-        "android.hardware.radio@1.4.vndk.29.x86.vendor",
-        "android.hardware.secure_element@1.0.vndk.29.x86.vendor",
-        "android.hardware.secure_element@1.1.vndk.29.x86.vendor",
-        "android.hardware.sensors@1.0.vndk.29.x86.vendor",
-        "android.hardware.sensors@2.0.vndk.29.x86.vendor",
-        "android.hardware.soundtrigger@2.0.vndk.29.x86.vendor",
-        "android.hardware.soundtrigger@2.0-core.vndk.29.x86.vendor",
-        "android.hardware.soundtrigger@2.1.vndk.29.x86.vendor",
-        "android.hardware.soundtrigger@2.2.vndk.29.x86.vendor",
-        "android.hardware.tetheroffload.config@1.0.vndk.29.x86.vendor",
-        "android.hardware.tetheroffload.control@1.0.vndk.29.x86.vendor",
-        "android.hardware.thermal@1.0.vndk.29.x86.vendor",
-        "android.hardware.thermal@1.1.vndk.29.x86.vendor",
-        "android.hardware.thermal@2.0.vndk.29.x86.vendor",
-        "android.hardware.tv.cec@1.0.vndk.29.x86.vendor",
-        "android.hardware.tv.cec@2.0.vndk.29.x86.vendor",
-        "android.hardware.tv.input@1.0.vndk.29.x86.vendor",
-        "android.hardware.usb.gadget@1.0.vndk.29.x86.vendor",
-        "android.hardware.usb@1.0.vndk.29.x86.vendor",
-        "android.hardware.usb@1.1.vndk.29.x86.vendor",
-        "android.hardware.usb@1.2.vndk.29.x86.vendor",
-        "android.hardware.vibrator@1.0.vndk.29.x86.vendor",
-        "android.hardware.vibrator@1.1.vndk.29.x86.vendor",
-        "android.hardware.vibrator@1.2.vndk.29.x86.vendor",
-        "android.hardware.vibrator@1.3.vndk.29.x86.vendor",
-        "android.hardware.vr@1.0.vndk.29.x86.vendor",
-        "android.hardware.weaver@1.0.vndk.29.x86.vendor",
-        "android.hardware.wifi.hostapd@1.0.vndk.29.x86.vendor",
-        "android.hardware.wifi.hostapd@1.1.vndk.29.x86.vendor",
-        "android.hardware.wifi.offload@1.0.vndk.29.x86.vendor",
-        "android.hardware.wifi.supplicant@1.0.vndk.29.x86.vendor",
-        "android.hardware.wifi.supplicant@1.1.vndk.29.x86.vendor",
-        "android.hardware.wifi.supplicant@1.2.vndk.29.x86.vendor",
-        "android.hardware.wifi@1.0.vndk.29.x86.vendor",
-        "android.hardware.wifi@1.1.vndk.29.x86.vendor",
-        "android.hardware.wifi@1.2.vndk.29.x86.vendor",
-        "android.hardware.wifi@1.3.vndk.29.x86.vendor",
-        "android.hidl.allocator@1.0.vndk.29.x86.vendor",
-        "android.hidl.memory.block@1.0.vndk.29.x86.vendor",
-        "android.hidl.token@1.0.vndk.29.x86.vendor",
-        "android.hidl.token@1.0-utils.vndk.29.x86.vendor",
-        "android.system.net.netd@1.0.vndk.29.x86.vendor",
-        "android.system.net.netd@1.1.vndk.29.x86.vendor",
-        "android.system.suspend@1.0.vndk.29.x86.vendor",
-        "android.system.wifi.keystore@1.0.vndk.29.x86.vendor",
-        "libadf.vndk.29.x86.vendor",
-        "libaudioroute.vndk.29.x86.vendor",
-        "libaudioutils.vndk.29.x86.vendor",
-        "libbinder.vndk.29.x86.vendor",
-        "libcamera_metadata.vndk.29.x86.vendor",
-        "libcap.vndk.29.x86.vendor",
-        "libclang_rt.scudo-i686-android.vndk.29.x86.vendor",
-        "libclang_rt.scudo_minimal-i686-android.vndk.29.x86.vendor",
-        "libclang_rt.ubsan_minimal-i686-android.vndk.29.x86.vendor",
-        "libclang_rt.ubsan_standalone-i686-android.vndk.29.x86.vendor",
-        "libcn-cbor.vndk.29.x86.vendor",
-        "libcodec2.vndk.29.x86.vendor",
-        "libcrypto.vndk.29.x86.vendor",
-        "libcrypto_utils.vndk.29.x86.vendor",
-        "libcurl.vndk.29.x86.vendor",
-        "libdiskconfig.vndk.29.x86.vendor",
-        "libdumpstateutil.vndk.29.x86.vendor",
-        "libevent.vndk.29.x86.vendor",
-        "libexif.vndk.29.x86.vendor",
-        "libexpat.vndk.29.x86.vendor",
-        "libfmq.vndk.29.x86.vendor",
-        "libgatekeeper.vndk.29.x86.vendor",
-        "libgui.vndk.29.x86.vendor",
-        "libhardware_legacy.vndk.29.x86.vendor",
-        "libhidlallocatorutils.vndk.29.x86.vendor",
-        "libhidlcache.vndk.29.x86.vendor",
-        "libjpeg.vndk.29.x86.vendor",
-        "libkeymaster_messages.vndk.29.x86.vendor",
-        "libkeymaster_portable.vndk.29.x86.vendor",
-        "libldacBT_abr.vndk.29.x86.vendor",
-        "libldacBT_enc.vndk.29.x86.vendor",
-        "liblz4.vndk.29.x86.vendor",
-        "libmedia_helper.vndk.29.x86.vendor",
-        "libmedia_omx.vndk.29.x86.vendor",
-        "libmemtrack.vndk.29.x86.vendor",
-        "libminijail.vndk.29.x86.vendor",
-        "libmkbootimg_abi_check.vndk.29.x86.vendor",
-        "libnetutils.vndk.29.x86.vendor",
-        "libnl.vndk.29.x86.vendor",
-        "libpcre2.vndk.29.x86.vendor",
-        "libpiex.vndk.29.x86.vendor",
-        "libpng.vndk.29.x86.vendor",
-        "libpower.vndk.29.x86.vendor",
-        "libprocinfo.vndk.29.x86.vendor",
-        "libprotobuf-cpp-full.vndk.29.x86.vendor",
-        "libprotobuf-cpp-lite.vndk.29.x86.vendor",
-        "libpuresoftkeymasterdevice.vndk.29.x86.vendor",
-        "libradio_metadata.vndk.29.x86.vendor",
-        "libselinux.vndk.29.x86.vendor",
-        "libsoftkeymasterdevice.vndk.29.x86.vendor",
-        "libspeexresampler.vndk.29.x86.vendor",
-        "libsqlite.vndk.29.x86.vendor",
-        "libssl.vndk.29.x86.vendor",
-        "libstagefright_bufferpool@2.0.vndk.29.x86.vendor",
-        "libstagefright_bufferqueue_helper.vndk.29.x86.vendor",
-        "libstagefright_foundation.vndk.29.x86.vendor",
-        "libstagefright_omx.vndk.29.x86.vendor",
-        "libstagefright_omx_utils.vndk.29.x86.vendor",
-        "libstagefright_xmlparser.vndk.29.x86.vendor",
-        "libsysutils.vndk.29.x86.vendor",
-        "libtinyalsa.vndk.29.x86.vendor",
-        "libtinyxml2.vndk.29.x86.vendor",
-        "libui.vndk.29.x86.vendor",
-        "libusbhost.vndk.29.x86.vendor",
-        "libwifi-system-iface.vndk.29.x86.vendor",
-        "libxml2.vndk.29.x86.vendor",
-        "libyuv.vndk.29.x86.vendor",
-        "libziparchive.vndk.29.x86.vendor",
-        "android.hardware.graphics.common@1.0.vndk.29.x86.vendor",
-        "android.hardware.graphics.common@1.1.vndk.29.x86.vendor",
-        "android.hardware.graphics.common@1.2.vndk.29.x86.vendor",
-        "android.hardware.graphics.mapper@2.0.vndk.29.x86.vendor",
-        "android.hardware.graphics.mapper@2.1.vndk.29.x86.vendor",
-        "android.hardware.graphics.mapper@3.0.vndk.29.x86.vendor",
-        "android.hardware.renderscript@1.0.vndk.29.x86.vendor",
-        "android.hidl.memory.token@1.0.vndk.29.x86.vendor",
-        "android.hidl.memory@1.0.vndk.29.x86.vendor",
-        "android.hidl.memory@1.0-impl.vndk.29.x86.vendor",
-        "android.hidl.safe_union@1.0.vndk.29.x86.vendor",
-        "libRSCpuRef.vndk.29.x86.vendor",
-        "libRSDriver.vndk.29.x86.vendor",
-        "libRS_internal.vndk.29.x86.vendor",
-        "libbacktrace.vndk.29.x86.vendor",
-        "libbase.vndk.29.x86.vendor",
-        "libbcinfo.vndk.29.x86.vendor",
-        "libbinderthreadstate.vndk.29.x86.vendor",
-        "libblas.vndk.29.x86.vendor",
-        "libc++.vndk.29.x86.vendor",
-        "libcompiler_rt.vndk.29.x86.vendor",
-        "libcutils.vndk.29.x86.vendor",
-        "libhardware.vndk.29.x86.vendor",
-        "libhidlbase.vndk.29.x86.vendor",
-        "libhidlmemory.vndk.29.x86.vendor",
-        "libhidltransport.vndk.29.x86.vendor",
-        "libhwbinder.vndk.29.x86.vendor",
-        "libhwbinder_noltopgo.vndk.29.x86.vendor",
-        "libion.vndk.29.x86.vendor",
-        "libjsoncpp.vndk.29.x86.vendor",
-        "liblzma.vndk.29.x86.vendor",
-        "libprocessgroup.vndk.29.x86.vendor",
-        "libunwindstack.vndk.29.x86.vendor",
-        "libutils.vndk.29.x86.vendor",
-        "libutilscallstack.vndk.29.x86.vendor",
-        "libz.vndk.29.x86.vendor",
-        "ld.config.29.txt",
-        "llndk.libraries.29.txt",
-        "vndksp.libraries.29.txt",
-        "vndkcore.libraries.29.txt",
-        "vndkprivate.libraries.29.txt",
-    ],
-}
-
 vndk_prebuilt_shared {
     name: "android.frameworks.cameraservice.common@2.0",
     version: "29",
diff --git a/x86/binder32/Android.bp b/x86/binder32/Android.bp
index 77e2188..ba6ceae 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -1,270 +1,6 @@
 // THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
 // DO NOT EDIT
 
-phony {
-    name: "vndk_v29_x86_binder32",
-    required: [
-        "android.frameworks.cameraservice.common@2.0.vndk.29.x86.binder32.vendor",
-        "android.frameworks.cameraservice.device@2.0.vndk.29.x86.binder32.vendor",
-        "android.frameworks.cameraservice.service@2.0.vndk.29.x86.binder32.vendor",
-        "android.frameworks.displayservice@1.0.vndk.29.x86.binder32.vendor",
-        "android.frameworks.schedulerservice@1.0.vndk.29.x86.binder32.vendor",
-        "android.frameworks.sensorservice@1.0.vndk.29.x86.binder32.vendor",
-        "android.frameworks.stats@1.0.vndk.29.x86.binder32.vendor",
-        "android.frameworks.vr.composer@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.atrace@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio.common@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio.common@4.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio.common@5.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio.effect@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio.effect@4.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio.effect@5.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio@4.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.audio@5.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.authsecret@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.automotive.audiocontrol@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.automotive.evs@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.automotive.vehicle@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.biometrics.face@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.biometrics.fingerprint@2.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.bluetooth.a2dp@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.bluetooth.audio@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.bluetooth@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.boot@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.broadcastradio@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.broadcastradio@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.broadcastradio@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.common@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.device@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.device@3.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.device@3.3.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.device@3.4.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.device@3.5.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.metadata@3.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.metadata@3.3.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.metadata@3.4.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.provider@2.4.vndk.29.x86.binder32.vendor",
-        "android.hardware.camera.provider@2.5.vndk.29.x86.binder32.vendor",
-        "android.hardware.cas.native@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.cas@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.cas@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.configstore-utils.vndk.29.x86.binder32.vendor",
-        "android.hardware.configstore@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.configstore@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.confirmationui-support-lib.vndk.29.x86.binder32.vendor",
-        "android.hardware.confirmationui@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.contexthub@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.drm@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.drm@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.drm@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.dumpstate@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.fastboot@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.gatekeeper@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.gnss.visibility_control@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.gnss@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.gnss@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.gnss@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.allocator@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.allocator@3.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.bufferqueue@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.bufferqueue@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.composer@2.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.composer@2.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.composer@2.3.vndk.29.x86.binder32.vendor",
-        "android.hardware.health.storage@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.health@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.health@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.input.classifier@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.input.common@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.ir@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.keymaster@3.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.keymaster@4.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.light@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.media.bufferpool@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.media.bufferpool@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.media.c2@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.media.omx@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.media@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.memtrack@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.neuralnetworks@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.neuralnetworks@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.neuralnetworks@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.nfc@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.nfc@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.nfc@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.oemlock@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.power.stats@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.power@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.power@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.power@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.power@1.3.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio.config@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio.config@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio.config@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio.deprecated@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio@1.3.vndk.29.x86.binder32.vendor",
-        "android.hardware.radio@1.4.vndk.29.x86.binder32.vendor",
-        "android.hardware.secure_element@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.secure_element@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.sensors@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.sensors@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.soundtrigger@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.soundtrigger@2.0-core.vndk.29.x86.binder32.vendor",
-        "android.hardware.soundtrigger@2.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.soundtrigger@2.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.tetheroffload.config@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.tetheroffload.control@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.thermal@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.thermal@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.thermal@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.tv.cec@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.tv.cec@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.tv.input@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.usb.gadget@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.usb@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.usb@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.usb@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.vibrator@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.vibrator@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.vibrator@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.vibrator@1.3.vndk.29.x86.binder32.vendor",
-        "android.hardware.vr@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.weaver@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi.hostapd@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi.hostapd@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi.offload@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi.supplicant@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi.supplicant@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi.supplicant@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.wifi@1.3.vndk.29.x86.binder32.vendor",
-        "android.hidl.allocator@1.0.vndk.29.x86.binder32.vendor",
-        "android.hidl.memory.block@1.0.vndk.29.x86.binder32.vendor",
-        "android.hidl.token@1.0.vndk.29.x86.binder32.vendor",
-        "android.hidl.token@1.0-utils.vndk.29.x86.binder32.vendor",
-        "android.system.net.netd@1.0.vndk.29.x86.binder32.vendor",
-        "android.system.net.netd@1.1.vndk.29.x86.binder32.vendor",
-        "android.system.suspend@1.0.vndk.29.x86.binder32.vendor",
-        "android.system.wifi.keystore@1.0.vndk.29.x86.binder32.vendor",
-        "libadf.vndk.29.x86.binder32.vendor",
-        "libaudioroute.vndk.29.x86.binder32.vendor",
-        "libaudioutils.vndk.29.x86.binder32.vendor",
-        "libbinder.vndk.29.x86.binder32.vendor",
-        "libcamera_metadata.vndk.29.x86.binder32.vendor",
-        "libcap.vndk.29.x86.binder32.vendor",
-        "libclang_rt.scudo-i686-android.vndk.29.x86.binder32.vendor",
-        "libclang_rt.scudo_minimal-i686-android.vndk.29.x86.binder32.vendor",
-        "libclang_rt.ubsan_minimal-i686-android.vndk.29.x86.binder32.vendor",
-        "libclang_rt.ubsan_standalone-i686-android.vndk.29.x86.binder32.vendor",
-        "libcn-cbor.vndk.29.x86.binder32.vendor",
-        "libcodec2.vndk.29.x86.binder32.vendor",
-        "libcrypto.vndk.29.x86.binder32.vendor",
-        "libcrypto_utils.vndk.29.x86.binder32.vendor",
-        "libcurl.vndk.29.x86.binder32.vendor",
-        "libdiskconfig.vndk.29.x86.binder32.vendor",
-        "libdumpstateutil.vndk.29.x86.binder32.vendor",
-        "libevent.vndk.29.x86.binder32.vendor",
-        "libexif.vndk.29.x86.binder32.vendor",
-        "libexpat.vndk.29.x86.binder32.vendor",
-        "libfmq.vndk.29.x86.binder32.vendor",
-        "libgatekeeper.vndk.29.x86.binder32.vendor",
-        "libgui.vndk.29.x86.binder32.vendor",
-        "libhardware_legacy.vndk.29.x86.binder32.vendor",
-        "libhidlallocatorutils.vndk.29.x86.binder32.vendor",
-        "libhidlcache.vndk.29.x86.binder32.vendor",
-        "libjpeg.vndk.29.x86.binder32.vendor",
-        "libkeymaster_messages.vndk.29.x86.binder32.vendor",
-        "libkeymaster_portable.vndk.29.x86.binder32.vendor",
-        "libldacBT_abr.vndk.29.x86.binder32.vendor",
-        "libldacBT_enc.vndk.29.x86.binder32.vendor",
-        "liblz4.vndk.29.x86.binder32.vendor",
-        "libmedia_helper.vndk.29.x86.binder32.vendor",
-        "libmedia_omx.vndk.29.x86.binder32.vendor",
-        "libmemtrack.vndk.29.x86.binder32.vendor",
-        "libminijail.vndk.29.x86.binder32.vendor",
-        "libmkbootimg_abi_check.vndk.29.x86.binder32.vendor",
-        "libnetutils.vndk.29.x86.binder32.vendor",
-        "libnl.vndk.29.x86.binder32.vendor",
-        "libpcre2.vndk.29.x86.binder32.vendor",
-        "libpiex.vndk.29.x86.binder32.vendor",
-        "libpng.vndk.29.x86.binder32.vendor",
-        "libpower.vndk.29.x86.binder32.vendor",
-        "libprocinfo.vndk.29.x86.binder32.vendor",
-        "libprotobuf-cpp-full.vndk.29.x86.binder32.vendor",
-        "libprotobuf-cpp-lite.vndk.29.x86.binder32.vendor",
-        "libpuresoftkeymasterdevice.vndk.29.x86.binder32.vendor",
-        "libradio_metadata.vndk.29.x86.binder32.vendor",
-        "libselinux.vndk.29.x86.binder32.vendor",
-        "libsoftkeymasterdevice.vndk.29.x86.binder32.vendor",
-        "libspeexresampler.vndk.29.x86.binder32.vendor",
-        "libsqlite.vndk.29.x86.binder32.vendor",
-        "libssl.vndk.29.x86.binder32.vendor",
-        "libstagefright_bufferpool@2.0.vndk.29.x86.binder32.vendor",
-        "libstagefright_bufferqueue_helper.vndk.29.x86.binder32.vendor",
-        "libstagefright_foundation.vndk.29.x86.binder32.vendor",
-        "libstagefright_omx.vndk.29.x86.binder32.vendor",
-        "libstagefright_omx_utils.vndk.29.x86.binder32.vendor",
-        "libstagefright_xmlparser.vndk.29.x86.binder32.vendor",
-        "libsysutils.vndk.29.x86.binder32.vendor",
-        "libtinyalsa.vndk.29.x86.binder32.vendor",
-        "libtinyxml2.vndk.29.x86.binder32.vendor",
-        "libui.vndk.29.x86.binder32.vendor",
-        "libusbhost.vndk.29.x86.binder32.vendor",
-        "libwifi-system-iface.vndk.29.x86.binder32.vendor",
-        "libxml2.vndk.29.x86.binder32.vendor",
-        "libyuv.vndk.29.x86.binder32.vendor",
-        "libziparchive.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.common@1.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.common@1.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.common@1.2.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.mapper@2.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.mapper@2.1.vndk.29.x86.binder32.vendor",
-        "android.hardware.graphics.mapper@3.0.vndk.29.x86.binder32.vendor",
-        "android.hardware.renderscript@1.0.vndk.29.x86.binder32.vendor",
-        "android.hidl.memory.token@1.0.vndk.29.x86.binder32.vendor",
-        "android.hidl.memory@1.0.vndk.29.x86.binder32.vendor",
-        "android.hidl.memory@1.0-impl.vndk.29.x86.binder32.vendor",
-        "android.hidl.safe_union@1.0.vndk.29.x86.binder32.vendor",
-        "libRSCpuRef.vndk.29.x86.binder32.vendor",
-        "libRSDriver.vndk.29.x86.binder32.vendor",
-        "libRS_internal.vndk.29.x86.binder32.vendor",
-        "libbacktrace.vndk.29.x86.binder32.vendor",
-        "libbase.vndk.29.x86.binder32.vendor",
-        "libbcinfo.vndk.29.x86.binder32.vendor",
-        "libbinderthreadstate.vndk.29.x86.binder32.vendor",
-        "libblas.vndk.29.x86.binder32.vendor",
-        "libc++.vndk.29.x86.binder32.vendor",
-        "libcompiler_rt.vndk.29.x86.binder32.vendor",
-        "libcutils.vndk.29.x86.binder32.vendor",
-        "libhardware.vndk.29.x86.binder32.vendor",
-        "libhidlbase.vndk.29.x86.binder32.vendor",
-        "libhidlmemory.vndk.29.x86.binder32.vendor",
-        "libhidltransport.vndk.29.x86.binder32.vendor",
-        "libhwbinder.vndk.29.x86.binder32.vendor",
-        "libhwbinder_noltopgo.vndk.29.x86.binder32.vendor",
-        "libion.vndk.29.x86.binder32.vendor",
-        "libjsoncpp.vndk.29.x86.binder32.vendor",
-        "liblzma.vndk.29.x86.binder32.vendor",
-        "libprocessgroup.vndk.29.x86.binder32.vendor",
-        "libunwindstack.vndk.29.x86.binder32.vendor",
-        "libutils.vndk.29.x86.binder32.vendor",
-        "libutilscallstack.vndk.29.x86.binder32.vendor",
-        "libz.vndk.29.x86.binder32.vendor",
-        "ld.config.29.txt",
-        "llndk.libraries.29.txt",
-        "vndksp.libraries.29.txt",
-        "vndkcore.libraries.29.txt",
-        "vndkprivate.libraries.29.txt",
-    ],
-}
-
 vndk_prebuilt_shared {
     name: "android.frameworks.cameraservice.common@2.0",
     version: "29",
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 81a1d47..4918aee 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -1,274 +1,6 @@
 // THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
 // DO NOT EDIT
 
-phony {
-    name: "vndk_v29_x86_64",
-    required: [
-        "android.frameworks.cameraservice.common@2.0.vndk.29.x86_64.vendor",
-        "android.frameworks.cameraservice.device@2.0.vndk.29.x86_64.vendor",
-        "android.frameworks.cameraservice.service@2.0.vndk.29.x86_64.vendor",
-        "android.frameworks.displayservice@1.0.vndk.29.x86_64.vendor",
-        "android.frameworks.schedulerservice@1.0.vndk.29.x86_64.vendor",
-        "android.frameworks.sensorservice@1.0.vndk.29.x86_64.vendor",
-        "android.frameworks.stats@1.0.vndk.29.x86_64.vendor",
-        "android.frameworks.vr.composer@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.atrace@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio.common@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio.common@4.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio.common@5.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio.effect@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio.effect@4.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio.effect@5.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio@4.0.vndk.29.x86_64.vendor",
-        "android.hardware.audio@5.0.vndk.29.x86_64.vendor",
-        "android.hardware.authsecret@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.automotive.audiocontrol@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.automotive.evs@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.automotive.vehicle@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.biometrics.face@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.biometrics.fingerprint@2.1.vndk.29.x86_64.vendor",
-        "android.hardware.bluetooth.a2dp@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.bluetooth.audio@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.bluetooth@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.boot@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.broadcastradio@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.broadcastradio@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.broadcastradio@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.camera.common@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.camera.device@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.camera.device@3.2.vndk.29.x86_64.vendor",
-        "android.hardware.camera.device@3.3.vndk.29.x86_64.vendor",
-        "android.hardware.camera.device@3.4.vndk.29.x86_64.vendor",
-        "android.hardware.camera.device@3.5.vndk.29.x86_64.vendor",
-        "android.hardware.camera.metadata@3.2.vndk.29.x86_64.vendor",
-        "android.hardware.camera.metadata@3.3.vndk.29.x86_64.vendor",
-        "android.hardware.camera.metadata@3.4.vndk.29.x86_64.vendor",
-        "android.hardware.camera.provider@2.4.vndk.29.x86_64.vendor",
-        "android.hardware.camera.provider@2.5.vndk.29.x86_64.vendor",
-        "android.hardware.cas.native@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.cas@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.cas@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.configstore-utils.vndk.29.x86_64.vendor",
-        "android.hardware.configstore@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.configstore@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.confirmationui-support-lib.vndk.29.x86_64.vendor",
-        "android.hardware.confirmationui@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.contexthub@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.drm@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.drm@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.drm@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.dumpstate@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.fastboot@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.gatekeeper@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.gnss.visibility_control@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.gnss@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.gnss@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.gnss@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.allocator@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.allocator@3.0.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.bufferqueue@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.bufferqueue@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.composer@2.1.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.composer@2.2.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.composer@2.3.vndk.29.x86_64.vendor",
-        "android.hardware.health.storage@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.health@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.health@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.input.classifier@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.input.common@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.ir@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.keymaster@3.0.vndk.29.x86_64.vendor",
-        "android.hardware.keymaster@4.0.vndk.29.x86_64.vendor",
-        "android.hardware.light@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.media.bufferpool@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.media.bufferpool@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.media.c2@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.media.omx@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.media@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.memtrack@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.neuralnetworks@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.neuralnetworks@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.neuralnetworks@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.nfc@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.nfc@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.nfc@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.oemlock@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.power.stats@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.power@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.power@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.power@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.power@1.3.vndk.29.x86_64.vendor",
-        "android.hardware.radio.config@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.radio.config@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.radio.config@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.radio.deprecated@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.radio@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.radio@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.radio@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.radio@1.3.vndk.29.x86_64.vendor",
-        "android.hardware.radio@1.4.vndk.29.x86_64.vendor",
-        "android.hardware.secure_element@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.secure_element@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.sensors@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.sensors@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.soundtrigger@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.soundtrigger@2.0-core.vndk.29.x86_64.vendor",
-        "android.hardware.soundtrigger@2.1.vndk.29.x86_64.vendor",
-        "android.hardware.soundtrigger@2.2.vndk.29.x86_64.vendor",
-        "android.hardware.tetheroffload.config@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.tetheroffload.control@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.thermal@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.thermal@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.thermal@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.tv.cec@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.tv.cec@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.tv.input@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.usb.gadget@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.usb@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.usb@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.usb@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.vibrator@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.vibrator@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.vibrator@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.vibrator@1.3.vndk.29.x86_64.vendor",
-        "android.hardware.vr@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.weaver@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.wifi.hostapd@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.wifi.hostapd@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.wifi.offload@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.wifi.supplicant@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.wifi.supplicant@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.wifi.supplicant@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.wifi@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.wifi@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.wifi@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.wifi@1.3.vndk.29.x86_64.vendor",
-        "android.hidl.allocator@1.0.vndk.29.x86_64.vendor",
-        "android.hidl.memory.block@1.0.vndk.29.x86_64.vendor",
-        "android.hidl.token@1.0.vndk.29.x86_64.vendor",
-        "android.hidl.token@1.0-utils.vndk.29.x86_64.vendor",
-        "android.system.net.netd@1.0.vndk.29.x86_64.vendor",
-        "android.system.net.netd@1.1.vndk.29.x86_64.vendor",
-        "android.system.suspend@1.0.vndk.29.x86_64.vendor",
-        "android.system.wifi.keystore@1.0.vndk.29.x86_64.vendor",
-        "libadf.vndk.29.x86_64.vendor",
-        "libaudioroute.vndk.29.x86_64.vendor",
-        "libaudioutils.vndk.29.x86_64.vendor",
-        "libbinder.vndk.29.x86_64.vendor",
-        "libcamera_metadata.vndk.29.x86_64.vendor",
-        "libcap.vndk.29.x86_64.vendor",
-        "libclang_rt.scudo-i686-android.vndk.29.x86_64.vendor",
-        "libclang_rt.scudo-x86_64-android.vndk.29.x86_64.vendor",
-        "libclang_rt.scudo_minimal-i686-android.vndk.29.x86_64.vendor",
-        "libclang_rt.scudo_minimal-x86_64-android.vndk.29.x86_64.vendor",
-        "libclang_rt.ubsan_minimal-i686-android.vndk.29.x86_64.vendor",
-        "libclang_rt.ubsan_minimal-x86_64-android.vndk.29.x86_64.vendor",
-        "libclang_rt.ubsan_standalone-i686-android.vndk.29.x86_64.vendor",
-        "libclang_rt.ubsan_standalone-x86_64-android.vndk.29.x86_64.vendor",
-        "libcn-cbor.vndk.29.x86_64.vendor",
-        "libcodec2.vndk.29.x86_64.vendor",
-        "libcrypto.vndk.29.x86_64.vendor",
-        "libcrypto_utils.vndk.29.x86_64.vendor",
-        "libcurl.vndk.29.x86_64.vendor",
-        "libdiskconfig.vndk.29.x86_64.vendor",
-        "libdumpstateutil.vndk.29.x86_64.vendor",
-        "libevent.vndk.29.x86_64.vendor",
-        "libexif.vndk.29.x86_64.vendor",
-        "libexpat.vndk.29.x86_64.vendor",
-        "libfmq.vndk.29.x86_64.vendor",
-        "libgatekeeper.vndk.29.x86_64.vendor",
-        "libgui.vndk.29.x86_64.vendor",
-        "libhardware_legacy.vndk.29.x86_64.vendor",
-        "libhidlallocatorutils.vndk.29.x86_64.vendor",
-        "libhidlcache.vndk.29.x86_64.vendor",
-        "libjpeg.vndk.29.x86_64.vendor",
-        "libkeymaster_messages.vndk.29.x86_64.vendor",
-        "libkeymaster_portable.vndk.29.x86_64.vendor",
-        "libldacBT_abr.vndk.29.x86_64.vendor",
-        "libldacBT_enc.vndk.29.x86_64.vendor",
-        "liblz4.vndk.29.x86_64.vendor",
-        "libmedia_helper.vndk.29.x86_64.vendor",
-        "libmedia_omx.vndk.29.x86_64.vendor",
-        "libmemtrack.vndk.29.x86_64.vendor",
-        "libminijail.vndk.29.x86_64.vendor",
-        "libmkbootimg_abi_check.vndk.29.x86_64.vendor",
-        "libnetutils.vndk.29.x86_64.vendor",
-        "libnl.vndk.29.x86_64.vendor",
-        "libpcre2.vndk.29.x86_64.vendor",
-        "libpiex.vndk.29.x86_64.vendor",
-        "libpng.vndk.29.x86_64.vendor",
-        "libpower.vndk.29.x86_64.vendor",
-        "libprocinfo.vndk.29.x86_64.vendor",
-        "libprotobuf-cpp-full.vndk.29.x86_64.vendor",
-        "libprotobuf-cpp-lite.vndk.29.x86_64.vendor",
-        "libpuresoftkeymasterdevice.vndk.29.x86_64.vendor",
-        "libradio_metadata.vndk.29.x86_64.vendor",
-        "libselinux.vndk.29.x86_64.vendor",
-        "libsoftkeymasterdevice.vndk.29.x86_64.vendor",
-        "libspeexresampler.vndk.29.x86_64.vendor",
-        "libsqlite.vndk.29.x86_64.vendor",
-        "libssl.vndk.29.x86_64.vendor",
-        "libstagefright_bufferpool@2.0.vndk.29.x86_64.vendor",
-        "libstagefright_bufferqueue_helper.vndk.29.x86_64.vendor",
-        "libstagefright_foundation.vndk.29.x86_64.vendor",
-        "libstagefright_omx.vndk.29.x86_64.vendor",
-        "libstagefright_omx_utils.vndk.29.x86_64.vendor",
-        "libstagefright_xmlparser.vndk.29.x86_64.vendor",
-        "libsysutils.vndk.29.x86_64.vendor",
-        "libtinyalsa.vndk.29.x86_64.vendor",
-        "libtinyxml2.vndk.29.x86_64.vendor",
-        "libui.vndk.29.x86_64.vendor",
-        "libusbhost.vndk.29.x86_64.vendor",
-        "libwifi-system-iface.vndk.29.x86_64.vendor",
-        "libxml2.vndk.29.x86_64.vendor",
-        "libyuv.vndk.29.x86_64.vendor",
-        "libziparchive.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.common@1.0.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.common@1.1.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.common@1.2.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.mapper@2.0.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.mapper@2.1.vndk.29.x86_64.vendor",
-        "android.hardware.graphics.mapper@3.0.vndk.29.x86_64.vendor",
-        "android.hardware.renderscript@1.0.vndk.29.x86_64.vendor",
-        "android.hidl.memory.token@1.0.vndk.29.x86_64.vendor",
-        "android.hidl.memory@1.0.vndk.29.x86_64.vendor",
-        "android.hidl.memory@1.0-impl.vndk.29.x86_64.vendor",
-        "android.hidl.safe_union@1.0.vndk.29.x86_64.vendor",
-        "libRSCpuRef.vndk.29.x86_64.vendor",
-        "libRSDriver.vndk.29.x86_64.vendor",
-        "libRS_internal.vndk.29.x86_64.vendor",
-        "libbacktrace.vndk.29.x86_64.vendor",
-        "libbase.vndk.29.x86_64.vendor",
-        "libbcinfo.vndk.29.x86_64.vendor",
-        "libbinderthreadstate.vndk.29.x86_64.vendor",
-        "libblas.vndk.29.x86_64.vendor",
-        "libc++.vndk.29.x86_64.vendor",
-        "libcompiler_rt.vndk.29.x86_64.vendor",
-        "libcutils.vndk.29.x86_64.vendor",
-        "libhardware.vndk.29.x86_64.vendor",
-        "libhidlbase.vndk.29.x86_64.vendor",
-        "libhidlmemory.vndk.29.x86_64.vendor",
-        "libhidltransport.vndk.29.x86_64.vendor",
-        "libhwbinder.vndk.29.x86_64.vendor",
-        "libhwbinder_noltopgo.vndk.29.x86_64.vendor",
-        "libion.vndk.29.x86_64.vendor",
-        "libjsoncpp.vndk.29.x86_64.vendor",
-        "liblzma.vndk.29.x86_64.vendor",
-        "libprocessgroup.vndk.29.x86_64.vendor",
-        "libunwindstack.vndk.29.x86_64.vendor",
-        "libutils.vndk.29.x86_64.vendor",
-        "libutilscallstack.vndk.29.x86_64.vendor",
-        "libz.vndk.29.x86_64.vendor",
-        "ld.config.29.txt",
-        "llndk.libraries.29.txt",
-        "vndksp.libraries.29.txt",
-        "vndkcore.libraries.29.txt",
-        "vndkprivate.libraries.29.txt",
-    ],
-}
-
 vndk_prebuilt_shared {
     name: "android.frameworks.cameraservice.common@2.0",
     version: "29",