diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 022462e823..27c10af58e 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -102,6 +102,13 @@ PRODUCT_SYSTEM_SERVER_JARS := \
     ethernet-service \
     wifi-service
 
+# Adoptable external storage supports both ext4 and f2fs
+PRODUCT_PACKAGES += \
+    e2fsck \
+    make_ext4fs \
+    fsck.f2fs \
+    make_f2fs \
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.zygote=zygote32
 PRODUCT_COPY_FILES += \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 9f0f8a86f6..982f7da1c9 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -42,7 +42,6 @@ PRODUCT_PACKAGES += \
     gps.goldfish \
     fingerprint.goldfish \
     sensors.goldfish \
-    e2fsck \
     audio.primary.goldfish \
     vibrator.goldfish \
     power.goldfish \
@@ -50,7 +49,6 @@ PRODUCT_PACKAGES += \
     fingerprintd \
     sensors.ranchu
 
-
 PRODUCT_COPY_FILES += \
     device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \
     device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \