diff --git a/aosp_cheetah.mk b/aosp_cheetah.mk
index b81dfd6..8f44682 100644
--- a/aosp_cheetah.mk
+++ b/aosp_cheetah.mk
@@ -30,3 +30,5 @@ PRODUCT_MANUFACTURER := Google
 
 DEVICE_MANIFEST_FILE := \
 	device/google/pantah/manifest.xml
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/aosp_panther.mk b/aosp_panther.mk
index a4b5617..36a4cb1 100644
--- a/aosp_panther.mk
+++ b/aosp_panther.mk
@@ -30,3 +30,5 @@ PRODUCT_MANUFACTURER := Google
 
 DEVICE_MANIFEST_FILE := \
 	device/google/pantah/manifest.xml
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/device-cheetah.mk b/device-cheetah.mk
index b604573..6e88c98 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -290,7 +290,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=11
+    ro.vendor.build.svn=12
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-panther.mk b/device-panther.mk
index 94f88c6..c7f9b10 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -275,7 +275,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=11
+    ro.vendor.build.svn=12
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \