diff --git a/target/product/module_arm.mk b/target/product/module_arm.mk
index d99dce8b2..0deb43df9 100644
--- a/target/product/module_arm.mk
+++ b/target/product/module_arm.mk
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
 
 PRODUCT_NAME := module_arm
 PRODUCT_BRAND := Android
-PRODUCT_DEVICE := module_arm
diff --git a/target/product/module_arm64.mk b/target/product/module_arm64.mk
index fc9529ce3..8effa785a 100644
--- a/target/product/module_arm64.mk
+++ b/target/product/module_arm64.mk
@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
 
 PRODUCT_NAME := module_arm64
 PRODUCT_BRAND := Android
-PRODUCT_DEVICE := module_arm64
diff --git a/target/product/module_x86.mk b/target/product/module_x86.mk
index b852e7a6d..5f75c82b5 100644
--- a/target/product/module_x86.mk
+++ b/target/product/module_x86.mk
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
 
 PRODUCT_NAME := module_x86
 PRODUCT_BRAND := Android
-PRODUCT_DEVICE := module_x86
diff --git a/target/product/module_x86_64.mk b/target/product/module_x86_64.mk
index f6bc1fc30..9196cd250 100644
--- a/target/product/module_x86_64.mk
+++ b/target/product/module_x86_64.mk
@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
 
 PRODUCT_NAME := module_x86_64
 PRODUCT_BRAND := Android
-PRODUCT_DEVICE := module_x86_64