Merge "Revert "Make the generic armv8 config pretend it has a 2nd arch.""
diff --git a/armv8/BoardConfig.mk b/armv8/BoardConfig.mk
index b9cc70c..e50c642 100644
--- a/armv8/BoardConfig.mk
+++ b/armv8/BoardConfig.mk
@@ -27,10 +27,4 @@
 TARGET_SUPPORTS_32_BIT_APPS :=
 TARGET_SUPPORTS_64_BIT_APPS := true
 
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := krait
-
 USE_CLANG_PLATFORM_BUILD := true