Snap for 13256841 from 9b56575da8f43b8e72eda33d4d066608c0f1f2d9 to 25Q2-release

Change-Id: Ic9e79bcce00e318955e06369b9d4a76b0de1e2b5
diff --git a/project/vm-x86_64-test-user.mk b/project/vm-x86_64-test-user.mk
index 16fa5fe..509c6eb 100644
--- a/project/vm-x86_64-test-user.mk
+++ b/project/vm-x86_64-test-user.mk
@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-include project/vm-arm64-test-inc.mk
+include project/vm-x86_64-test-inc.mk
diff --git a/project/vm-x86_64-test-userdebug.mk b/project/vm-x86_64-test-userdebug.mk
index 13341ea..cff5d45 100644
--- a/project/vm-x86_64-test-userdebug.mk
+++ b/project/vm-x86_64-test-userdebug.mk
@@ -21,4 +21,4 @@
 # If SYMTAB_ENABLED is true: do not strip symbols from the resulting app binary
 SYMTAB_ENABLED ?= true
 
-include project/vm-arm64-test-inc.mk
+include project/vm-x86_64-test-inc.mk
diff --git a/project/vm-x86_64-test_os-user.mk b/project/vm-x86_64-test_os-user.mk
index 8a428e7..6176085 100644
--- a/project/vm-x86_64-test_os-user.mk
+++ b/project/vm-x86_64-test_os-user.mk
@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-include project/vm-arm64-test_os-inc.mk
+include project/vm-x86_64-test_os-inc.mk
diff --git a/project/vm-x86_64-test_os-userdebug.mk b/project/vm-x86_64-test_os-userdebug.mk
index 2086881..01bb82b 100644
--- a/project/vm-x86_64-test_os-userdebug.mk
+++ b/project/vm-x86_64-test_os-userdebug.mk
@@ -21,4 +21,4 @@
 # If SYMTAB_ENABLED is true: do not strip symbols from the resulting app binary
 SYMTAB_ENABLED ?= true
 
-include project/vm-arm64-test_os-inc.mk
+include project/vm-x86_64-test_os-inc.mk
diff --git a/project/vm-x86_64-virt-test-inc.mk b/project/vm-x86_64-virt-test-inc.mk
index 497cd94..1c291f8 100644
--- a/project/vm-x86_64-virt-test-inc.mk
+++ b/project/vm-x86_64-virt-test-inc.mk
@@ -14,5 +14,5 @@
 #
 
 include project/generic-x86_64-virt-inc.mk
-include project/generic-x86_65_test-inc.mk
+include project/generic-x86_64_test-inc.mk