Merge cherrypicks of ['googleplex-android-review.googlesource.com/37034524'] into 25Q2-release.

Change-Id: I1fa777a24ef639a3b104ead5cd246277643a5f58

guest/pvmfw/src/arch/aarch64/payload.rs

diff --git a/guest/pvmfw/src/arch/aarch64/payload.rs b/guest/pvmfw/src/arch/aarch64/payload.rs
index 77e9a31..8c2242e 100644
--- a/guest/pvmfw/src/arch/aarch64/payload.rs
+++ b/guest/pvmfw/src/arch/aarch64/payload.rs
@@ -91,7 +91,7 @@
             "b.lo 0b",
 
             // Flush d-cache over .data & .bss (including skipped region).
-            "0: dc cvau, {cache_line}",
+            "0: dc cvac, {cache_line}",
             "add {cache_line}, {cache_line}, {dcache_line_size}",
             "cmp {cache_line}, {scratch_end}",
             "b.lo 0b",
@@ -103,7 +103,7 @@
             "b.lo 0b",
 
             // Flush d-cache over stack region.
-            "0: dc cvau, {cache_line}",
+            "0: dc cvac, {cache_line}",
             "add {cache_line}, {cache_line}, {dcache_line_size}",
             "cmp {cache_line}, {stack_end}",
             "b.lo 0b",
@@ -115,7 +115,7 @@
             "b.lo 0b",
 
             // Flush d-cache over EH stack region.
-            "0: dc cvau, {cache_line}",
+            "0: dc cvac, {cache_line}",
             "add {cache_line}, {cache_line}, {dcache_line_size}",
             "cmp {cache_line}, {eh_stack_end}",
             "b.lo 0b",

libs/libvmbase/src/arch.rs

diff --git a/libs/libvmbase/src/arch.rs b/libs/libvmbase/src/arch.rs
index 29d3a32..e25745b 100644
--- a/libs/libvmbase/src/arch.rs
+++ b/libs/libvmbase/src/arch.rs
@@ -47,7 +47,7 @@
             let end = start + size;
             let start = crate::util::unchecked_align_down(start, line_size);
             for line in (start..end).step_by(line_size) {
-                crate::dc!("cvau", line);
+                crate::dc!("cvac", line);
             }
         } else {
             compile_error!("Unsupported target_arch")