diff --git a/core/Makefile b/core/Makefile
index 56153c9f9..6a1625bf3 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -845,7 +845,8 @@ endef
 
 built_ota_tools := \
 	$(call intermediates-dir-for,EXECUTABLES,applypatch)/applypatch \
-	$(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq
+	$(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq \
+	$(call intermediates-dir-for,EXECUTABLES,updater)/updater
 $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)
 
 # Depending on the various images guarantees that the underlying
diff --git a/target/product/core.mk b/target/product/core.mk
index 45e9ad6d0..8cf6b245e 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -22,6 +22,7 @@ PRODUCT_PACKAGES := \
     SettingsProvider \
     TelephonyProvider \
     TtsService \
+    VpnServices \
     UserDictionaryProvider \
     PackageInstaller \
     WebSearchProvider \