diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5acc95fe0..4a72c1ed6 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -101,12 +101,14 @@ PRODUCT_PACKAGES += \
     ld.mc \
     libaaudio \
     libandroid \
+    libandroidfw \
     libandroid_runtime \
     libandroid_servers \
     libaudioeffect_jni \
     libaudioflinger \
     libaudiopolicymanager \
     libaudiopolicyservice \
+    libaudioutils \
     libbinder \
     libc \
     libcamera2ndk \
@@ -139,6 +141,7 @@ PRODUCT_PACKAGES += \
     libkeystore \
     liblog \
     libm \
+    libmdnssd \
     libmedia \
     libmedia_jni \
     libmediandk \
@@ -153,6 +156,7 @@ PRODUCT_PACKAGES += \
     libpdfium \
     libpixelflinger \
     libpower \
+    libpowermanager \
     libradio_metadata \
     librtp_jni \
     libsensorservice \
@@ -163,6 +167,7 @@ PRODUCT_PACKAGES += \
     libsoundpool \
     libsoundtrigger \
     libsoundtriggerservice \
+    libspeexresampler \
     libsqlite \
     libstagefright \
     libstagefright_amrnb_common \
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 575bd60fe..9ab49ef00 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -22,13 +22,5 @@ PRODUCT_PACKAGES += \
     Home \
     TelephonyProvider \
     UserDictionaryProvider \
-    libandroidfw \
-    libaudioutils \
-    libmdnssd \
-    libnfc_ndef \
-    libpowermanager \
-    libspeexresampler \
-    libvariablespeed \
-    libwebrtc_audio_preprocessing \
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 65a7a2e39..c460eca41 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -61,6 +61,7 @@ PRODUCT_PACKAGES += \
     libstagefright_soft_vorbisdec \
     libstagefright_soft_vpxdec \
     libstagefright_soft_vpxenc \
+    libwebrtc_audio_preprocessing \
     libwebviewchromium_loader \
     libwebviewchromium_plat_support \
     PackageInstaller \