diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 84a2c76..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2022 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter cupid diting marble mayfly mondrian thor unicorn zeus ziyi zizhan,$(TARGET_DEVICE)),)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-include $(CLEAR_VARS)
-
-# A/B builds require us to create the mount points at compile time.
-FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt
-$(FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(FIRMWARE_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt
-
-BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware
-$(BT_FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(BT_FIRMWARE_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware
-
-DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp
-$(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(DSP_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/dsp
-
-VM_SYSTEM_MOUNT_POINT := $(TARGET_OUT_VENDOR)/vm-system
-$(VM_SYSTEM_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating $(VM_SYSTEM_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/vm-system
-
-ALL_DEFAULT_INSTALLED_MODULES += \
-    $(FIRMWARE_MOUNT_POINT) \
-    $(BT_FIRMWARE_MOUNT_POINT) \
-    $(DSP_MOUNT_POINT) \
-    $(VM_SYSTEM_MOUNT_POINT)
-
-endif
diff --git a/common.mk b/common.mk
index 0e7394c..7922a48 100644
--- a/common.mk
+++ b/common.mk
@@ -280,6 +280,12 @@ PRODUCT_PACKAGES += \
     WifiResTarget_spf
 
 # Partitions
+PRODUCT_PACKAGES += \
+    vendor_bt_firmware_mountpoint \
+    vendor_dsp_mountpoint \
+    vendor_firmware_mnt_mountpoint \
+    vendor_vm-system_mountpoint
+
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
 
 # Power