diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index ce09166..b127dad 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -20,8 +20,6 @@
         core-libart \
         libart \
         dex2oat
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.lib=libart.so
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)
diff --git a/target/product/runtime_libart_default.mk b/target/product/runtime_libart_default.mk
index 49f4f45..575ca04 100644
--- a/target/product/runtime_libart_default.mk
+++ b/target/product/runtime_libart_default.mk
@@ -17,6 +17,6 @@
 # Set ART as the default runtime environment
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.lib=libart.so
+    persist.sys.dalvik.vm.lib=libart.so
 
 include $(SRC_TARGET_DIR)/product/runtime_libart.mk
diff --git a/target/product/runtime_libdvm_default.mk b/target/product/runtime_libdvm_default.mk
index bbe13bb..3ae4130 100644
--- a/target/product/runtime_libdvm_default.mk
+++ b/target/product/runtime_libdvm_default.mk
@@ -17,6 +17,6 @@
 # Set Dalvik as the default runtime environment
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.lib=libdvm.so
+    persist.sys.dalvik.vm.lib=libdvm.so
 
 include $(SRC_TARGET_DIR)/product/runtime_libdvm.mk