Merge "Fix `arm_v7_v8` device config." into main am: da18e01a1e

Original change: https://android-review.googlesource.com/c/device/generic/art/+/3204993

Change-Id: Ib3db57f02926f99f389bb6a858e7e9c9e0ab1584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/arm_v7_v8/BoardConfig.mk b/arm_v7_v8/BoardConfig.mk
index b252033..e30e784 100644
--- a/arm_v7_v8/BoardConfig.mk
+++ b/arm_v7_v8/BoardConfig.mk
@@ -24,7 +24,7 @@
 
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_VARIANT := cortex-a15
+TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi