diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
index 22b9f42..6744289 100644
--- a/target/board/generic_arm64_ab/BoardConfig.mk
+++ b/target/board/generic_arm64_ab/BoardConfig.mk
@@ -26,7 +26,7 @@
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := generic
+TARGET_2ND_CPU_VARIANT := cortex-a15
 
 # Enable A/B update
 TARGET_NO_RECOVERY := true
diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk
index 8637235..ec711c2 100644
--- a/target/board/treble_common.mk
+++ b/target/board/treble_common.mk
@@ -19,6 +19,7 @@
 
 # VNDK
 BOARD_VNDK_VERSION := current
+BOARD_VNDK_RUNTIME_DISABLE := true
 
 # Properties
 TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index ed68c78..8aedee7 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -83,4 +83,5 @@
     pm.dexopt.install=quicken \
     pm.dexopt.bg-dexopt=speed-profile \
     pm.dexopt.ab-ota=speed-profile \
-    pm.dexopt.inactive=verify
+    pm.dexopt.inactive=verify \
+    pm.dexopt.shared=speed