diff --git a/core/user_tags.mk b/core/user_tags.mk
index 2be1825e0f..a149be977a 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -91,6 +91,7 @@ GRANDFATHERED_USER_MODULES += \
 	dexdump \
 	dexlist \
 	dexopt \
+	dexpreopt \
 	dex-tools \
 	dhcpcd \
 	dhcpcd.conf \
@@ -126,6 +127,7 @@ GRANDFATHERED_USER_MODULES += \
 	fastboot \
 	framework \
 	FrameworkCoreHostTests \
+	framework-core-util-lib \
 	fsck_msdos \
 	fs_get_stats \
 	fw_bcm4329_apsta.bin \