diff --git a/src/gfxstream/codegen/scripts/cereal/common/codegen.py b/src/gfxstream/codegen/scripts/cereal/common/codegen.py
index 44180f01d45..91ccf2e84f8 100644
--- a/src/gfxstream/codegen/scripts/cereal/common/codegen.py
+++ b/src/gfxstream/codegen/scripts/cereal/common/codegen.py
@@ -800,8 +800,10 @@ class CodeGen(object):
                 accessType.getForNonConstAccess(), useParamName=False)
 
         ptrCast = "(uintptr_t)" if needPtrCast else ""
-
-        streamNamespace = "gfxstream::aemu"
+        if variant == "guest":
+            streamNamespace = "gfxstream::aemu"
+        else:
+            streamNamespace = "android::base"
 
         if direction == "read":
             self.stmt("memcpy((%s*)&%s, %s, %s)" %
diff --git a/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py b/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py
index ed534c7454a..407e5e20a5c 100644
--- a/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py
+++ b/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py
@@ -114,7 +114,10 @@ class VulkanReservedMarshalingCodegen(VulkanTypeIterator):
             else:
                 pass
 
-            streamNamespace = "gfxstream::aemu"
+            if self.variant == "guest":
+                streamNamespace = "gfxstream::aemu"
+            else:
+                streamNamespace = "android::base"
             if self.direction == "write":
                 self.cgen.stmt("%s::Stream::%s((uint8_t*)*%s)" % (streamNamespace, streamMethod, varname))
             else:
@@ -970,7 +973,10 @@ class VulkanReservedMarshaling(VulkanWrapperGenerator):
 
         cgen.line("// known or null extension struct")
 
-        streamNamespace = "gfxstream::aemu"
+        if self.variant == "guest":
+            streamNamespace = "gfxstream::aemu"
+        else:
+            streamNamespace = "android::base"
 
         if direction == "write":
             cgen.stmt("memcpy(*%s, &%s, sizeof(uint32_t));" % (self.ptrVarName, sizeVar))