Merge "Rename the dump directories in vts_vndk_abi_test" am: de9d926e96

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2019659

Change-Id: I61ff01ccc0c27e0f35b8fcf8f49efa6f5c538b69
diff --git a/golden/vndk_data.py b/golden/vndk_data.py
index e1fdfd3..b2183bb 100644
--- a/golden/vndk_data.py
+++ b/golden/vndk_data.py
@@ -49,9 +49,9 @@
 # The tuples of (ABI name, bitness, arch name). 64-bit comes before 32-bit in
 # order to sequentially search for longest prefix.
 _ABI_LIST = (
-    ("arm64", 64, "arm64_armv8-a"),
-    ("arm64", 32, "arm_armv8-a"),
-    ("arm", 32, "arm_armv7-a-neon"),
+    ("arm64", 64, "arm64"),
+    ("arm64", 32, "arm_arm64"),
+    ("arm", 32, "arm"),
     ("x86_64", 64, "x86_64"),
     ("x86_64", 32, "x86_x86_64"),
     ("x86", 32, "x86"),