Make coral/flame use generic arch variant

This makes the system image more generic. The intent is so to
add another set of flags to allow the vendor partition to compile with
more specific flags once the build system can support that.

Bug: 120773446
Test: make
Change-Id: Iece74603a7ea62dbe45318a1f8ba27f8f4872ad4
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 733a67f..d86ecd4 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -18,17 +18,20 @@
 TARGET_BOARD_INFO_FILE := device/google/coral/board-info.txt
 USES_DEVICE_GOOGLE_CORAL := true
 TARGET_NO_BOOTLOADER := true
+
 TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-2a
+TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := cortex-a76
+TARGET_CPU_VARIANT := generic
+TARGET_CPU_VARIANT_RUNTIME := cortex-a76
 
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a76
+TARGET_2ND_CPU_VARIANT := generic
+TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a76
 
 BUILD_BROKEN_ENG_DEBUG_TAGS := true