diff --git a/core/main.mk b/core/main.mk
index c65fe3ccbc..88687688a3 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -768,10 +768,6 @@ ifdef is_sdk_build
   $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
     $(if $(strip $(ALL_MODULES.$(m).INSTALLED) $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).INSTALLED)),,\
       $(eval dangling_modules += $(m))))
-  ifneq ($(TARGET_IS_64_BIT),true)
-    # We know those 64-bit modules don't exist in the 32-bit SDK build.
-    dangling_modules := $(filter-out %64,$(dangling_modules))
-  endif
   ifneq ($(dangling_modules),)
     $(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)
   endif
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index cfac003873..29d3ada929 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -22,7 +22,6 @@ PRODUCT_PACKAGES += \
     adbd \
     bootanimation \
     debuggerd \
-    debuggerd64 \
     dumpstate \
     dumpsys \
     gralloc.default \
@@ -56,7 +55,6 @@ PRODUCT_PACKAGES += \
     libui \
     libutils \
     linker \
-    linker64 \
     logcat \
     logwrapper \
     mkshrc \