Update iostream namespace to gfxstream::guest

... to avoid conflicts with
hardware/google/gfxstream/include/render-utils/IOStream.h
when the guest is built for the host
for end2end tests.

Bug: b/292257025
Test: cvd start --gpu_mode=gfxstream
Change-Id: I2f2d5b7d670e67953d89142fd152d089ac40b13e
diff --git a/codegen/generic-apigen/ApiGen.cpp b/codegen/generic-apigen/ApiGen.cpp
index 33c5754..7343ec9 100644
--- a/codegen/generic-apigen/ApiGen.cpp
+++ b/codegen/generic-apigen/ApiGen.cpp
@@ -365,10 +365,10 @@
 
     fprintf(fp, "struct %s : public %s_%s_context_t {\n\n",
             classname.c_str(), m_basename.c_str(), sideString(CLIENT_SIDE));
-    fprintf(fp, "\tgfxstream::IOStream *m_stream;\n");
+    fprintf(fp, "\tgfxstream::guest::IOStream *m_stream;\n");
     fprintf(fp, "\tChecksumCalculator *m_checksumCalculator;\n\n");
 
-    fprintf(fp, "\t%s(gfxstream::IOStream *stream, ChecksumCalculator *checksumCalculator);\n", classname.c_str());
+    fprintf(fp, "\t%s(gfxstream::guest::IOStream *stream, ChecksumCalculator *checksumCalculator);\n", classname.c_str());
     fprintf(fp, "\tvirtual uint64_t lockAndWriteDma(void*, uint32_t) { return 0; }\n");
     fprintf(fp, "};\n\n");
 
@@ -580,7 +580,7 @@
     fprintf(fp, "#include \"EncoderDebug.h\"\n\n");
 
     // fprintf(fp, "namespace gfxstream {\n\n");
-    fprintf(fp, "using gfxstream::IOStream;\n\n");
+    fprintf(fp, "using gfxstream::guest::IOStream;\n\n");
     fprintf(fp, "namespace {\n\n");
 
     // unsupport printout
diff --git a/codegen/vulkan/scripts/cereal/common/codegen.py b/codegen/vulkan/scripts/cereal/common/codegen.py
index 218f00c..1f217e3 100644
--- a/codegen/vulkan/scripts/cereal/common/codegen.py
+++ b/codegen/vulkan/scripts/cereal/common/codegen.py
@@ -749,7 +749,7 @@
             self.stmt("%s->%s(%s)" %
                       (streamVar, streamMethod, streamStorageVar))
 
-    def memcpyPrimitive(self, typeInfo, streamVar, accessExpr, accessType, direction="write"):
+    def memcpyPrimitive(self, typeInfo, streamVar, accessExpr, accessType, variant, direction="write"):
         accessTypeName = accessType.typeName
 
         if accessType.pointerIndirectionLevels == 0 and not self.validPrimitive(typeInfo, accessTypeName):
@@ -788,13 +788,16 @@
 
         ptrCast = "(uintptr_t)" if needPtrCast else ""
 
+        streamNamespace = "gfxstream::guest" if variant == "guest" else "android::base"
+
         if direction == "read":
             self.stmt("memcpy((%s*)&%s, %s, %s)" %
                       (accessCast,
                        accessExpr,
                        streamVar,
                        str(streamSize)))
-            self.stmt("android::base::Stream::%s((uint8_t*)&%s)" % (
+            self.stmt("%s::Stream::%s((uint8_t*)&%s)" % (
+                streamNamespace,
                 streamMethod,
                 accessExpr))
         else:
@@ -803,7 +806,8 @@
                        streamStorageVarType, ptrCast, accessExpr))
             self.stmt("memcpy(%s, &%s, %s)" %
                       (streamVar, streamStorageVar, str(streamSize)))
-            self.stmt("android::base::Stream::%s((uint8_t*)%s)" % (
+            self.stmt("%s::Stream::%s((uint8_t*)%s)" % (
+                streamNamespace,
                 streamMethod,
                 streamVar))
 
diff --git a/codegen/vulkan/scripts/cereal/decoder.py b/codegen/vulkan/scripts/cereal/decoder.py
index b556709..fb4692d 100644
--- a/codegen/vulkan/scripts/cereal/decoder.py
+++ b/codegen/vulkan/scripts/cereal/decoder.py
@@ -141,6 +141,7 @@
     if destroy:
         iterateVulkanType(typeInfo, param, VulkanReservedMarshalingCodegen(
             cgen,
+            "host",
             READ_STREAM,
             ROOT_TYPE_DEFAULT_VALUE,
             param.paramName,
@@ -168,6 +169,7 @@
             cgen.line("// No unbox for %s" % (param.paramName))
         iterateVulkanType(typeInfo, param, VulkanReservedMarshalingCodegen(
             cgen,
+            "host",
             READ_STREAM,
             ROOT_TYPE_DEFAULT_VALUE,
             param.paramName,
@@ -185,6 +187,7 @@
 
     iterateVulkanType(typeInfo, param, VulkanReservedMarshalingCodegen(
         cgen,
+        "host",
         READ_STREAM,
         ROOT_TYPE_DEFAULT_VALUE,
         param.paramName,
diff --git a/codegen/vulkan/scripts/cereal/encoder.py b/codegen/vulkan/scripts/cereal/encoder.py
index 2a8e5f3..ff62215 100644
--- a/codegen/vulkan/scripts/cereal/encoder.py
+++ b/codegen/vulkan/scripts/cereal/encoder.py
@@ -18,11 +18,10 @@
 from .wrapperdefs import VULKAN_STREAM_TYPE_GUEST
 
 encoder_decl_preamble = """
-using gfxstream::guest::HealthMonitor;
 
 class VkEncoder {
 public:
-    VkEncoder(IOStream* stream, HealthMonitor<>* healthMonitor = nullptr);
+    VkEncoder(gfxstream::guest::IOStream* stream, gfxstream::guest::HealthMonitor<>* healthMonitor = nullptr);
     ~VkEncoder();
 
 #include "VkEncoder.h.inl"
@@ -32,7 +31,7 @@
 private:
     class Impl;
     std::unique_ptr<Impl> mImpl;
-    HealthMonitor<>* mHealthMonitor;
+    gfxstream::guest::HealthMonitor<>* mHealthMonitor;
 };
 """
 
@@ -174,7 +173,7 @@
         iterateVulkanType(
             typeInfo, param,
             VulkanReservedMarshalingCodegen( \
-                cgen, STREAM, ROOT_TYPE_DEFAULT_VALUE, param.paramName, "streamPtrPtr",
+                cgen, "guest", STREAM, ROOT_TYPE_DEFAULT_VALUE, param.paramName, "streamPtrPtr",
                API_PREFIX_RESERVEDMARSHAL,
                "" if forOutput else "get_host_u64_",
                direction="write"))
diff --git a/codegen/vulkan/scripts/cereal/reservedmarshaling.py b/codegen/vulkan/scripts/cereal/reservedmarshaling.py
index 7146b57..3b54a41 100644
--- a/codegen/vulkan/scripts/cereal/reservedmarshaling.py
+++ b/codegen/vulkan/scripts/cereal/reservedmarshaling.py
@@ -35,6 +35,7 @@
 class VulkanReservedMarshalingCodegen(VulkanTypeIterator):
     def __init__(self,
                  cgen,
+                 variant,
                  streamVarName,
                  rootTypeVarName,
                  inputVarName,
@@ -50,6 +51,7 @@
                  stackVar=None,
                  stackArrSize=None):
         self.cgen = cgen
+        self.variant = variant
         self.direction = direction
         self.processSimple = "write" if self.direction == "write" else "read"
         self.forApiOutput = forApiOutput
@@ -124,10 +126,11 @@
             else:
                 pass
 
+            streamNamespace = "gfxstream::guest" if self.variant == "guest" else "android::base"
             if self.direction == "write":
-                self.cgen.stmt("android::base::Stream::%s((uint8_t*)*%s)" % (streamMethod, varname))
+                self.cgen.stmt("%s::Stream::%s((uint8_t*)*%s)" % (streamNamespace, streamMethod, varname))
             else:
-                self.cgen.stmt("android::base::Stream::%s((uint8_t*)%s)" % (streamMethod, toStreamExpr))
+                self.cgen.stmt("%s::Stream::%s((uint8_t*)%s)" % (streamNamespace, streamMethod, toStreamExpr))
 
         self.genPtrIncr(sizeExpr)
 
@@ -135,7 +138,7 @@
         varname = self.ptrVar
         cast = self.makeCastExpr(self.getTypeForStreaming(vulkanType))
         self.genMemcpyAndIncr(varname, cast, toStreamExpr, sizeExpr)
-    
+
     def genPrimitiveStreamCall(self, vulkanType, access):
         varname = self.ptrVar
         self.cgen.memcpyPrimitive(
@@ -143,6 +146,7 @@
             "(*" + varname + ")",
             access,
             vulkanType,
+            self.variant,
             direction=self.direction)
         self.genPtrIncr(str(self.cgen.countPrimitive(
             self.typeInfo,
@@ -735,6 +739,7 @@
         self.writeCodegen = \
             VulkanReservedMarshalingCodegen(
                 None,
+                self.variant,
                 VULKAN_STREAM_VAR_NAME,
                 ROOT_TYPE_VAR_NAME,
                 MARSHAL_INPUT_VAR_NAME,
@@ -746,6 +751,7 @@
         self.readCodegen = \
             VulkanReservedMarshalingCodegen(
                 None,
+                self.variant,
                 VULKAN_STREAM_VAR_NAME,
                 ROOT_TYPE_VAR_NAME,
                 UNMARSHAL_INPUT_VAR_NAME,
@@ -830,7 +836,7 @@
                 marshalingCode = \
                     CUSTOM_MARSHAL_TYPES[name]["common"] + \
                     CUSTOM_MARSHAL_TYPES[name]["reservedmarshaling"].format(
-                        streamVarName=self.writeCodegen.streamVarName, 
+                        streamVarName=self.writeCodegen.streamVarName,
                         rootTypeVarName=self.writeCodegen.rootTypeVarName,
                         inputVarName=self.writeCodegen.inputVarName,
                         newInputVarName=self.writeCodegen.inputVarName + "_new")
@@ -907,7 +913,7 @@
                 unmarshalingCode = \
                     CUSTOM_MARSHAL_TYPES[name]["common"] + \
                     CUSTOM_MARSHAL_TYPES[name]["reservedunmarshaling"].format(
-                        streamVarName=self.readCodegen.streamVarName, 
+                        streamVarName=self.readCodegen.streamVarName,
                         rootTypeVarName=self.readCodegen.rootTypeVarName,
                         inputVarName=self.readCodegen.inputVarName,
                         newInputVarName=self.readCodegen.inputVarName + "_new")
@@ -981,12 +987,14 @@
 
         cgen.line("// known or null extension struct")
 
+        streamNamespace = "gfxstream::guest" if self.variant == "guest" else "android::base"
+
         if direction == "write":
             cgen.stmt("memcpy(*%s, &%s, sizeof(uint32_t));" % (self.ptrVarName, sizeVar))
-            cgen.stmt("android::base::Stream::toBe32((uint8_t*)*%s); *%s += sizeof(uint32_t)" % (self.ptrVarName, self.ptrVarName))
+            cgen.stmt("%s::Stream::toBe32((uint8_t*)*%s); *%s += sizeof(uint32_t)" % (streamNamespace, self.ptrVarName, self.ptrVarName))
         elif not self.dynAlloc:
             cgen.stmt("memcpy(&%s, *%s, sizeof(uint32_t));" % (sizeVar, self.ptrVarName))
-            cgen.stmt("android::base::Stream::fromBe32((uint8_t*)&%s); *%s += sizeof(uint32_t)" % (sizeVar, self.ptrVarName))
+            cgen.stmt("%s::Stream::fromBe32((uint8_t*)&%s); *%s += sizeof(uint32_t)" % (streamNamespace, sizeVar, self.ptrVarName))
 
         cgen.beginIf("!%s" % (sizeVar))
         cgen.line("// exit if this was a null extension struct (size == 0 in this branch)")
diff --git a/codegen/vulkan/scripts/cereal/subdecode.py b/codegen/vulkan/scripts/cereal/subdecode.py
index b77cad7..a248f4b 100644
--- a/codegen/vulkan/scripts/cereal/subdecode.py
+++ b/codegen/vulkan/scripts/cereal/subdecode.py
@@ -52,6 +52,7 @@
     if destroy:
         iterateVulkanType(typeInfo, param, VulkanReservedMarshalingCodegen(
             cgen,
+            "host",
             READ_STREAM,
             ROOT_TYPE_DEFAULT_VALUE,
             param.paramName,
@@ -89,6 +90,7 @@
 
         iterateVulkanType(typeInfo, param, VulkanReservedMarshalingCodegen(
             cgen,
+            "host",
             READ_STREAM,
             ROOT_TYPE_DEFAULT_VALUE,
             param.paramName,
@@ -107,6 +109,7 @@
             "// Begin global wrapped dispatchable handle unboxing for %s" % param.paramName)
         iterateVulkanType(typeInfo, param, VulkanReservedMarshalingCodegen(
             cgen,
+            "host",
             READ_STREAM,
             ROOT_TYPE_DEFAULT_VALUE,
             param.paramName,
@@ -121,6 +124,7 @@
         # cgen.stmt("%s->unsetHandleMapping()" % READ_STREAM)
         iterateVulkanType(typeInfo, param, VulkanReservedMarshalingCodegen(
             cgen,
+            "host",
             READ_STREAM,
             ROOT_TYPE_DEFAULT_VALUE,
             param.paramName,
diff --git a/codegen/vulkan/scripts/cerealgenerator.py b/codegen/vulkan/scripts/cerealgenerator.py
index 16bfc77..32bf366 100644
--- a/codegen/vulkan/scripts/cerealgenerator.py
+++ b/codegen/vulkan/scripts/cerealgenerator.py
@@ -190,8 +190,10 @@
 #include <memory>
 
 namespace gfxstream {{
+namespace guest {{
 class IOStream;
-}}
+}}  // namespace guest
+}}  // namespace gfxstream
 """
         encoderImplInclude = f"""
 #include "EncoderDebug.h"
@@ -311,8 +313,8 @@
         poolIncludeGuest = f"""
 #include "goldfish_vk_private_defs.h"
 #include "{self.guestBaseLibDirPrefix}/BumpPool.h"
-using android::base::Allocator;
-using android::base::BumpPool;
+using gfxstream::guest::Allocator;
+using gfxstream::guest::BumpPool;
 // Stuff we are not going to use but if included,
 // will cause compile errors. These are Android Vulkan
 // required extensions, but the approach will be to
diff --git a/guest/GLESv1_enc/GLEncoder.cpp b/guest/GLESv1_enc/GLEncoder.cpp
index 6a6b361..7e5c133 100644
--- a/guest/GLESv1_enc/GLEncoder.cpp
+++ b/guest/GLESv1_enc/GLEncoder.cpp
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <vector>
 
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 #ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
diff --git a/guest/GLESv1_enc/GLEncoder.h b/guest/GLESv1_enc/GLEncoder.h
index 1d3378a..0be19c6 100644
--- a/guest/GLESv1_enc/GLEncoder.h
+++ b/guest/GLESv1_enc/GLEncoder.h
@@ -26,7 +26,7 @@
 class GLEncoder : public gl_encoder_context_t {
 
 public:
-    GLEncoder(gfxstream::IOStream *stream, ChecksumCalculator* protocol);
+    GLEncoder(gfxstream::guest::IOStream *stream, ChecksumCalculator* protocol);
     virtual ~GLEncoder();
     void setClientState(GLClientState *state) {
         m_state = state;
@@ -81,7 +81,7 @@
     glBufferData_client_proc_t m_glBufferData_enc;
     glBufferSubData_client_proc_t m_glBufferSubData_enc;
     glDeleteBuffers_client_proc_t m_glDeleteBuffers_enc;
-    
+
     glEnableClientState_client_proc_t m_glEnableClientState_enc;
     glDisableClientState_client_proc_t m_glDisableClientState_enc;
     glIsEnabled_client_proc_t m_glIsEnabled_enc;
diff --git a/guest/GLESv1_enc/gl_enc.cpp b/guest/GLESv1_enc/gl_enc.cpp
index df1d7f9..03d3af0 100644
--- a/guest/GLESv1_enc/gl_enc.cpp
+++ b/guest/GLESv1_enc/gl_enc.cpp
@@ -16,7 +16,7 @@
 
 #include "EncoderDebug.h"
 
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 namespace {
 
diff --git a/guest/GLESv1_enc/gl_enc.h b/guest/GLESv1_enc/gl_enc.h
index 8d272b3..80a1b67 100644
--- a/guest/GLESv1_enc/gl_enc.h
+++ b/guest/GLESv1_enc/gl_enc.h
@@ -14,10 +14,10 @@
 
 struct gl_encoder_context_t : public gl_client_context_t {
 
-	gfxstream::IOStream *m_stream;
+	gfxstream::guest::IOStream *m_stream;
 	ChecksumCalculator *m_checksumCalculator;
 
-	gl_encoder_context_t(gfxstream::IOStream *stream, ChecksumCalculator *checksumCalculator);
+	gl_encoder_context_t(gfxstream::guest::IOStream *stream, ChecksumCalculator *checksumCalculator);
 	virtual uint64_t lockAndWriteDma(void*, uint32_t) { return 0; }
 };
 
diff --git a/guest/GLESv2_enc/GL2Encoder.cpp b/guest/GLESv2_enc/GL2Encoder.cpp
index 2c0321d..e2584d1 100755
--- a/guest/GLESv2_enc/GL2Encoder.cpp
+++ b/guest/GLESv2_enc/GL2Encoder.cpp
@@ -31,7 +31,7 @@
 #include <GLES3/gl3.h>
 #include <GLES3/gl31.h>
 
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 #ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -3281,7 +3281,7 @@
     SET_ERROR_IF(state->boundFramebuffer(target) &&
                  (attachment == GL_BACK ||
                   attachment == GL_FRONT ||
-                  attachment == GL_DEPTH || 
+                  attachment == GL_DEPTH ||
                   attachment == GL_STENCIL),
                  GL_INVALID_OPERATION);
     ctx->m_glGetFramebufferAttachmentParameteriv_enc(self, target, attachment, pname, params);
@@ -5536,7 +5536,7 @@
 
     SET_ERROR_IF(!GLESv2Validation::allowedGetShader(pname), GL_INVALID_ENUM);
     VALIDATE_SHADER_NAME(shader);
-	
+
     if (pname == GL_SHADER_SOURCE_LENGTH) {
         ShaderData* shaderData = ctx->m_shared->getShaderData(shader);
         if (shaderData) {
diff --git a/guest/GLESv2_enc/GL2Encoder.h b/guest/GLESv2_enc/GL2Encoder.h
index e36538b..9c4f646 100644
--- a/guest/GLESv2_enc/GL2Encoder.h
+++ b/guest/GLESv2_enc/GL2Encoder.h
@@ -43,7 +43,7 @@
 
 class GL2Encoder : public gl2_encoder_context_t {
 public:
-    GL2Encoder(gfxstream::IOStream *stream, ChecksumCalculator* protocol);
+    GL2Encoder(gfxstream::guest::IOStream *stream, ChecksumCalculator* protocol);
     virtual ~GL2Encoder();
     const Extensions& getExtensions() const { return m_extensions; }
     void setDrawCallFlushInterval(uint32_t interval) {
@@ -205,7 +205,7 @@
     // need access to private class members
     class ErrorUpdater;
     template<class T> class ScopedQueryUpdate;
-    
+
     // General queries
     void safe_glGetBooleanv(GLenum param, GLboolean *val);
     void safe_glGetFloatv(GLenum param, GLfloat *val);
@@ -805,7 +805,7 @@
     // TODO: Compute shaders:
     // make sure it's OK to put memory barriers and compute dispatch
     // on the default encoding path
-   
+
     glVertexAttribFormat_client_proc_t m_glVertexAttribFormat_enc;
     glVertexAttribIFormat_client_proc_t m_glVertexAttribIFormat_enc;
     glVertexBindingDivisor_client_proc_t m_glVertexBindingDivisor_enc;
diff --git a/guest/GLESv2_enc/IOStream2.cpp b/guest/GLESv2_enc/IOStream2.cpp
index 445472c..c15eb40 100644
--- a/guest/GLESv2_enc/IOStream2.cpp
+++ b/guest/GLESv2_enc/IOStream2.cpp
@@ -9,6 +9,7 @@
 #include <assert.h>
 
 namespace gfxstream {
+namespace guest {
 
 void IOStream::readbackPixels(void* context, int width, int height, unsigned int format, unsigned int type, void* pixels) {
     GL2Encoder *ctx = (GL2Encoder *)context;
@@ -203,4 +204,5 @@
     }
 }
 
+}  // namespace guest
 }  // namespace gfxstream
\ No newline at end of file
diff --git a/guest/GLESv2_enc/gl2_enc.cpp b/guest/GLESv2_enc/gl2_enc.cpp
index 2b0dc33..9c4bc49 100644
--- a/guest/GLESv2_enc/gl2_enc.cpp
+++ b/guest/GLESv2_enc/gl2_enc.cpp
@@ -16,7 +16,7 @@
 
 #include "EncoderDebug.h"
 
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 namespace {
 
diff --git a/guest/GLESv2_enc/gl2_enc.h b/guest/GLESv2_enc/gl2_enc.h
index 501a339..9f4cb9d 100644
--- a/guest/GLESv2_enc/gl2_enc.h
+++ b/guest/GLESv2_enc/gl2_enc.h
@@ -15,10 +15,10 @@
 
 struct gl2_encoder_context_t : public gl2_client_context_t {
 
-	gfxstream::IOStream *m_stream;
+	gfxstream::guest::IOStream *m_stream;
 	ChecksumCalculator *m_checksumCalculator;
 
-	gl2_encoder_context_t(gfxstream::IOStream *stream, ChecksumCalculator *checksumCalculator);
+	gl2_encoder_context_t(gfxstream::guest::IOStream *stream, ChecksumCalculator *checksumCalculator);
 	virtual uint64_t lockAndWriteDma(void*, uint32_t) { return 0; }
 };
 
diff --git a/guest/OpenglCodecCommon/glUtils.cpp b/guest/OpenglCodecCommon/glUtils.cpp
index 52d8f1a..94f27ce 100644
--- a/guest/OpenglCodecCommon/glUtils.cpp
+++ b/guest/OpenglCodecCommon/glUtils.cpp
@@ -20,7 +20,7 @@
 
 #include <GLES3/gl31.h>
 
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 bool isSamplerType(GLenum type) {
     switch (type) {
diff --git a/guest/OpenglCodecCommon/meson.build b/guest/OpenglCodecCommon/meson.build
index 0dfcb47..5089261 100644
--- a/guest/OpenglCodecCommon/meson.build
+++ b/guest/OpenglCodecCommon/meson.build
@@ -12,5 +12,5 @@
    files_lib_codec_common,
    cpp_args: cpp_args,
    include_directories: [inc_android_compat, inc_qemu_pipe,
-                         inc_qemu_pipe_types, inc_host]
+                         inc_qemu_pipe_types, inc_guest_iostream]
 )
diff --git a/guest/OpenglSystemCommon/AddressSpaceStream.h b/guest/OpenglSystemCommon/AddressSpaceStream.h
index 2c9e9f4..a69f468 100644
--- a/guest/OpenglSystemCommon/AddressSpaceStream.h
+++ b/guest/OpenglSystemCommon/AddressSpaceStream.h
@@ -23,7 +23,7 @@
 #include "goldfish_address_space.h"
 
 using gfxstream::guest::HealthMonitor;
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 class AddressSpaceStream;
 
diff --git a/guest/OpenglSystemCommon/HostConnection.cpp b/guest/OpenglSystemCommon/HostConnection.cpp
index e9cde4c..b1751e3 100644
--- a/guest/OpenglSystemCommon/HostConnection.cpp
+++ b/guest/OpenglSystemCommon/HostConnection.cpp
@@ -44,8 +44,8 @@
 using gfxstream::guest::CreateHealthMonitor;
 using gfxstream::guest::HealthMonitor;
 using gfxstream::guest::HealthMonitorConsumerBasic;
+using gfxstream::guest::IOStream;
 using gfxstream::GoldfishGralloc;
-using gfxstream::IOStream;
 using gfxstream::MinigbmGralloc;
 
 #ifdef GOLDFISH_NO_GL
diff --git a/guest/OpenglSystemCommon/HostConnection.h b/guest/OpenglSystemCommon/HostConnection.h
index 0388912..a26c915 100644
--- a/guest/OpenglSystemCommon/HostConnection.h
+++ b/guest/OpenglSystemCommon/HostConnection.h
@@ -56,7 +56,7 @@
 // that will be used to track available emulator features.
 class ExtendedRCEncoderContext : public renderControl_encoder_context_t {
 public:
-    ExtendedRCEncoderContext(gfxstream::IOStream *stream, ChecksumCalculator *checksumCalculator)
+    ExtendedRCEncoderContext(gfxstream::guest::IOStream *stream, ChecksumCalculator *checksumCalculator)
         : renderControl_encoder_context_t(stream, checksumCalculator),
           m_dmaCxt(NULL), m_dmaPtr(NULL), m_dmaPhysAddr(0) { }
     void setSyncImpl(SyncImpl syncImpl) { m_featureInfo.syncImpl = syncImpl; }
@@ -248,7 +248,7 @@
     GrallocType m_grallocType;
 
     // intrusively refcounted
-    gfxstream::IOStream* m_stream = nullptr;
+    gfxstream::guest::IOStream* m_stream = nullptr;
 
     std::unique_ptr<GLEncoder> m_glEnc;
     std::unique_ptr<GL2Encoder> m_gl2Enc;
diff --git a/guest/OpenglSystemCommon/QemuPipeStream.h b/guest/OpenglSystemCommon/QemuPipeStream.h
index b70621d..1f57189 100644
--- a/guest/OpenglSystemCommon/QemuPipeStream.h
+++ b/guest/OpenglSystemCommon/QemuPipeStream.h
@@ -32,7 +32,7 @@
 #include <lib/zx/vmo.h>
 #endif
 
-class QemuPipeStream : public gfxstream::IOStream {
+class QemuPipeStream : public gfxstream::guest::IOStream {
 public:
     typedef enum { ERR_INVALID_SOCKET = -1000 } QemuPipeStreamError;
 
diff --git a/guest/OpenglSystemCommon/VirtioGpuPipeStream.h b/guest/OpenglSystemCommon/VirtioGpuPipeStream.h
index e446494..7da45e2 100644
--- a/guest/OpenglSystemCommon/VirtioGpuPipeStream.h
+++ b/guest/OpenglSystemCommon/VirtioGpuPipeStream.h
@@ -26,7 +26,7 @@
  * service on the host side.
  */
 
-class VirtioGpuPipeStream : public gfxstream::IOStream {
+class VirtioGpuPipeStream : public gfxstream::guest::IOStream {
 public:
     typedef enum { ERR_INVALID_SOCKET = -1000 } QemuPipeStreamError;
 
diff --git a/guest/OpenglSystemCommon/meson.build b/guest/OpenglSystemCommon/meson.build
index 7abf885..56eb60a 100644
--- a/guest/OpenglSystemCommon/meson.build
+++ b/guest/OpenglSystemCommon/meson.build
@@ -14,7 +14,7 @@
    'stream',
    files_lib_stream,
    cpp_args: cpp_args,
-   include_directories: [inc_vulkan_headers, inc_host, inc_opengl_codec,
+   include_directories: [inc_vulkan_headers, inc_guest_iostream, inc_opengl_codec,
                          inc_android_emu, inc_render_enc, inc_android_compat,
                          inc_qemu_pipe, inc_qemu_pipe_types, inc_gralloc,
                          inc_vulkan_enc, inc_goldfish_address_space,
diff --git a/guest/iostream/Android.bp b/guest/iostream/Android.bp
index 46251aa..29b45ec 100644
--- a/guest/iostream/Android.bp
+++ b/guest/iostream/Android.bp
@@ -35,6 +35,6 @@
         "liblog",
     ],
     export_include_dirs: [
-        "include/libOpenglRender",
+        "include",
     ],
 }
\ No newline at end of file
diff --git a/guest/iostream/include/libOpenglRender/IOStream.h b/guest/iostream/include/IOStream.h
similarity index 98%
rename from guest/iostream/include/libOpenglRender/IOStream.h
rename to guest/iostream/include/IOStream.h
index 8b1f052..bf57633 100644
--- a/guest/iostream/include/libOpenglRender/IOStream.h
+++ b/guest/iostream/include/IOStream.h
@@ -23,6 +23,7 @@
 #include "ErrorLog.h"
 
 namespace gfxstream {
+namespace guest {
 
 class IOStream {
 public:
@@ -135,7 +136,9 @@
     uint32_t m_refcount;
 };
 
+}  // namespace guest
 }  // namespace gfxstream
+
 //
 // When a client opens a connection to the renderer, it should
 // send unsigned int value indicating the "clientFlags".
diff --git a/guest/iostream/meson.build b/guest/iostream/meson.build
new file mode 100644
index 0000000..8e605c8
--- /dev/null
+++ b/guest/iostream/meson.build
@@ -0,0 +1,11 @@
+# Copyright 2023 Android Open Source Project
+# SPDX-License-Identifier: MIT
+
+inc_guest_iostream = include_directories('include')
+
+lib_guest_iostream = static_library(
+   'qemu_pipe',
+   [],
+   cpp_args: [cpp_args],
+   include_directories: [inc_guest_iostream]
+)
\ No newline at end of file
diff --git a/guest/magma/magma_enc/magma_enc.cpp b/guest/magma/magma_enc/magma_enc.cpp
index 819f9bc..d26967a 100644
--- a/guest/magma/magma_enc/magma_enc.cpp
+++ b/guest/magma/magma_enc/magma_enc.cpp
@@ -18,7 +18,7 @@
 
 #include "EncoderDebug.h"
 
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 namespace {
 
diff --git a/guest/magma/magma_enc/magma_enc.h b/guest/magma/magma_enc/magma_enc.h
index 4c270ad..f1bdefc 100644
--- a/guest/magma/magma_enc/magma_enc.h
+++ b/guest/magma/magma_enc/magma_enc.h
@@ -13,10 +13,10 @@
 
 struct magma_encoder_context_t : public magma_client_context_t {
 
-	gfxstream::IOStream *m_stream;
+	gfxstream::guest::IOStream *m_stream;
 	ChecksumCalculator *m_checksumCalculator;
 
-	magma_encoder_context_t(gfxstream::IOStream *stream, ChecksumCalculator *checksumCalculator);
+	magma_encoder_context_t(gfxstream::guest::IOStream *stream, ChecksumCalculator *checksumCalculator);
 	virtual uint64_t lockAndWriteDma(void*, uint32_t) { return 0; }
 };
 
diff --git a/guest/magma/meson.build b/guest/magma/meson.build
index 2870404..1c68e5a 100644
--- a/guest/magma/meson.build
+++ b/guest/magma/meson.build
@@ -19,7 +19,7 @@
       '-Wno-unused-function',
    ],
    include_directories: [inc_fuchsia_magma, inc_fuchsia_magma_nolib, inc_magma, inc_magma_enc,
-                         inc_android_emu, inc_host, inc_android_compat,
+                         inc_android_emu, inc_guest_iostream, inc_android_compat,
                          inc_opengl_codec, inc_opengl_system, inc_render_enc, inc_system,
                          inc_goldfish_address_space, inc_platform],
    link_with: [
diff --git a/guest/meson.build b/guest/meson.build
index 2875abb..b900b07 100644
--- a/guest/meson.build
+++ b/guest/meson.build
@@ -54,7 +54,6 @@
 inc_fuchsia_magma_nolib = include_directories('../third-party/fuchsia/magma/include/lib')
 inc_android_emu = include_directories('android-emu')
 inc_gralloc = include_directories('gralloc_cb/include')
-inc_host = include_directories('iostream/include/libOpenglRender')
 inc_magma = include_directories('magma')
 inc_opengl_codec = include_directories('OpenglCodecCommon')
 inc_opengl_system = include_directories('OpenglSystemCommon')
@@ -67,6 +66,7 @@
 #================#
 
 subdir('fuchsia')
+subdir('iostream')
 subdir('platform')
 subdir('android-emu/aemu/base')
 subdir('GoldfishAddressSpace')
diff --git a/guest/renderControl_enc/meson.build b/guest/renderControl_enc/meson.build
index fad55f4..4ecc030 100644
--- a/guest/renderControl_enc/meson.build
+++ b/guest/renderControl_enc/meson.build
@@ -9,6 +9,6 @@
    'render_control',
    files_lib_render_control_enc,
    cpp_args: cpp_args,
-   include_directories: [inc_host, inc_opengl_codec, inc_android_emu,
+   include_directories: [inc_guest_iostream, inc_opengl_codec, inc_android_emu,
                          inc_android_compat],
 )
diff --git a/guest/renderControl_enc/renderControl_enc.cpp b/guest/renderControl_enc/renderControl_enc.cpp
index 409eb00..0e3a443 100644
--- a/guest/renderControl_enc/renderControl_enc.cpp
+++ b/guest/renderControl_enc/renderControl_enc.cpp
@@ -16,7 +16,7 @@
 
 #include "EncoderDebug.h"
 
-using gfxstream::IOStream;
+using gfxstream::guest::IOStream;
 
 namespace {
 
diff --git a/guest/renderControl_enc/renderControl_enc.h b/guest/renderControl_enc/renderControl_enc.h
index 08340e9..5a3a940 100644
--- a/guest/renderControl_enc/renderControl_enc.h
+++ b/guest/renderControl_enc/renderControl_enc.h
@@ -15,10 +15,10 @@
 
 struct renderControl_encoder_context_t : public renderControl_client_context_t {
 
-	gfxstream::IOStream *m_stream;
+	gfxstream::guest::IOStream *m_stream;
 	ChecksumCalculator *m_checksumCalculator;
 
-	renderControl_encoder_context_t(gfxstream::IOStream *stream, ChecksumCalculator *checksumCalculator);
+	renderControl_encoder_context_t(gfxstream::guest::IOStream *stream, ChecksumCalculator *checksumCalculator);
 	virtual uint64_t lockAndWriteDma(void*, uint32_t) { return 0; }
 };
 
diff --git a/guest/vulkan/meson.build b/guest/vulkan/meson.build
index d88487e..1d3aaaf 100644
--- a/guest/vulkan/meson.build
+++ b/guest/vulkan/meson.build
@@ -13,7 +13,7 @@
    files_lib_vulkan_cereal,
    cpp_args: cpp_args,
    include_directories: [inc_vulkan_headers, inc_android_emu, inc_android_compat,
-                         inc_opengl_system, inc_host, inc_opengl_codec, inc_render_enc,
+                         inc_opengl_system, inc_guest_iostream, inc_opengl_codec, inc_render_enc,
                          inc_vulkan_enc, inc_platform],
    link_with: [lib_android_compat, lib_emu_android_base, lib_stream,
                lib_vulkan_enc],
diff --git a/guest/vulkan_enc/CommandBufferStagingStream.h b/guest/vulkan_enc/CommandBufferStagingStream.h
index 9aa9e96..8a95318 100644
--- a/guest/vulkan_enc/CommandBufferStagingStream.h
+++ b/guest/vulkan_enc/CommandBufferStagingStream.h
@@ -25,7 +25,7 @@
 namespace gfxstream {
 namespace vk {
 
-class CommandBufferStagingStream : public IOStream {
+class CommandBufferStagingStream : public gfxstream::guest::IOStream {
 public:
  // host will write kSyncDataReadComplete to the sync bytes to indicate memory is no longer being
  // used by host. This is only used with custom allocators. The sync bytes are used to ensure that,
diff --git a/guest/vulkan_enc/Resources.h b/guest/vulkan_enc/Resources.h
index 6270f9a..f269293 100644
--- a/guest/vulkan_enc/Resources.h
+++ b/guest/vulkan_enc/Resources.h
@@ -23,7 +23,12 @@
 #include <functional>
 
 namespace gfxstream {
+namespace guest {
 class IOStream;
+}  // namespace guest
+}  // namespace gfxstream
+
+namespace gfxstream {
 namespace vk {
 class VkEncoder;
 struct DescriptorPoolAllocationInfo;
@@ -47,7 +52,7 @@
         gfxstream::vk::VkEncoder* lastUsedEncoder; \
         uint32_t sequenceNumber; \
         gfxstream::vk::VkEncoder* privateEncoder; \
-        gfxstream::IOStream* privateStream; \
+        gfxstream::guest::IOStream* privateStream; \
         uint32_t flags; \
         struct goldfish_vk_object_list* poolObjects; \
         struct goldfish_vk_object_list* subObjects; \
@@ -124,7 +129,7 @@
     gfxstream::vk::VkEncoder* lastUsedEncoder;
     uint32_t sequenceNumber;
     gfxstream::vk::VkEncoder* privateEncoder;
-    gfxstream::IOStream* privateStream;
+    gfxstream::guest::IOStream* privateStream;
     uint32_t flags;
     struct goldfish_vk_object_list* poolObjects;
     struct goldfish_vk_object_list* subObjects;
diff --git a/guest/vulkan_enc/VkEncoder.cpp b/guest/vulkan_enc/VkEncoder.cpp
index fb04822..ca8b01c 100644
--- a/guest/vulkan_enc/VkEncoder.cpp
+++ b/guest/vulkan_enc/VkEncoder.cpp
@@ -172,7 +172,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -297,7 +297,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -405,7 +405,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPhysicalDeviceCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPhysicalDeviceCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPhysicalDeviceCount, sizeof(uint32_t));
@@ -415,7 +415,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPhysicalDevices;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPhysicalDevices) {
         if ((*(pPhysicalDeviceCount))) {
@@ -983,7 +983,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pQueueFamilyPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pQueueFamilyPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pQueueFamilyPropertyCount, sizeof(uint32_t));
@@ -992,7 +992,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pQueueFamilyProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pQueueFamilyProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pQueueFamilyPropertyCount)); ++i) {
@@ -1221,7 +1221,7 @@
     {
         uint32_t l = local_pName ? strlen(local_pName) : 0;
         memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
         *streamPtrPtr += sizeof(uint32_t);
         memcpy(*streamPtrPtr, (char*)local_pName, l);
         *streamPtrPtr += l;
@@ -1317,7 +1317,7 @@
     {
         uint32_t l = local_pName ? strlen(local_pName) : 0;
         memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
         *streamPtrPtr += sizeof(uint32_t);
         memcpy(*streamPtrPtr, (char*)local_pName, l);
         *streamPtrPtr += l;
@@ -1447,7 +1447,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -1572,7 +1572,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -1692,13 +1692,13 @@
         // WARNING PTR CHECK
         uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pLayerName;
         memcpy((*streamPtrPtr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
         if (local_pLayerName) {
             {
                 uint32_t l = local_pLayerName ? strlen(local_pLayerName) : 0;
                 memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-                android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+                gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
                 *streamPtrPtr += sizeof(uint32_t);
                 memcpy(*streamPtrPtr, (char*)local_pLayerName, l);
                 *streamPtrPtr += l;
@@ -1708,7 +1708,7 @@
         {
             uint32_t l = local_pLayerName ? strlen(local_pLayerName) : 0;
             memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
             *streamPtrPtr += sizeof(uint32_t);
             memcpy(*streamPtrPtr, (char*)local_pLayerName, l);
             *streamPtrPtr += l;
@@ -1717,7 +1717,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -1726,7 +1726,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -1890,13 +1890,13 @@
         // WARNING PTR CHECK
         uint64_t cgen_var_0_0 = (uint64_t)(uintptr_t)local_pLayerName;
         memcpy((*streamPtrPtr), &cgen_var_0_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
         if (local_pLayerName) {
             {
                 uint32_t l = local_pLayerName ? strlen(local_pLayerName) : 0;
                 memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-                android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+                gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
                 *streamPtrPtr += sizeof(uint32_t);
                 memcpy(*streamPtrPtr, (char*)local_pLayerName, l);
                 *streamPtrPtr += l;
@@ -1906,7 +1906,7 @@
         {
             uint32_t l = local_pLayerName ? strlen(local_pLayerName) : 0;
             memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
             *streamPtrPtr += sizeof(uint32_t);
             memcpy(*streamPtrPtr, (char*)local_pLayerName, l);
             *streamPtrPtr += l;
@@ -1915,7 +1915,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -1924,7 +1924,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -2062,7 +2062,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -2071,7 +2071,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -2217,7 +2217,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -2226,7 +2226,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -2778,7 +2778,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -2909,7 +2909,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -3907,7 +3907,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSparseMemoryRequirementCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirementCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSparseMemoryRequirementCount, sizeof(uint32_t));
@@ -3916,7 +3916,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pSparseMemoryRequirements;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirements) {
         for (uint32_t i = 0; i < (uint32_t)(*(pSparseMemoryRequirementCount)); ++i) {
@@ -4094,7 +4094,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -4103,7 +4103,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -4388,7 +4388,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -4519,7 +4519,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -4958,7 +4958,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -5090,7 +5090,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -5219,7 +5219,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -5350,7 +5350,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -5752,7 +5752,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -5884,7 +5884,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -6009,7 +6009,7 @@
     *streamPtrPtr += sizeof(uint32_t);
     uint64_t cgen_var_2 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pData, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
@@ -6141,7 +6141,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -6272,7 +6272,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -6404,7 +6404,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -6536,7 +6536,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -6665,7 +6665,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -6796,7 +6796,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -7044,7 +7044,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -7176,7 +7176,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -7310,7 +7310,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -7443,7 +7443,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -7577,7 +7577,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -7710,7 +7710,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -7825,18 +7825,18 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pDataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pDataSize) {
         uint64_t cgen_var_2_0 = (uint64_t)(*pDataSize);
         memcpy((*streamPtrPtr), &cgen_var_2_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
     }
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pData;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pData) {
         memcpy(*streamPtrPtr, (void*)pData, (*(pDataSize)) * sizeof(uint8_t));
@@ -8128,7 +8128,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -8308,7 +8308,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -8448,7 +8448,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -8583,7 +8583,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -8716,7 +8716,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -8846,7 +8846,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -8977,7 +8977,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -9114,7 +9114,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -9251,7 +9251,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -9387,7 +9387,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -9520,7 +9520,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -9866,7 +9866,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pDescriptorSets;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pDescriptorSets) {
         if (((descriptorSetCount))) {
@@ -10159,7 +10159,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -10292,7 +10292,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -10425,7 +10425,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -10558,7 +10558,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -10789,7 +10789,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -10922,7 +10922,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -11266,7 +11266,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pCommandBuffers;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pCommandBuffers) {
         if (((commandBufferCount))) {
@@ -17076,7 +17076,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPhysicalDeviceGroupCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPhysicalDeviceGroupCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPhysicalDeviceGroupCount, sizeof(uint32_t));
@@ -17085,7 +17085,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPhysicalDeviceGroupProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPhysicalDeviceGroupProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPhysicalDeviceGroupCount)); ++i) {
@@ -17488,7 +17488,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pSparseMemoryRequirementCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirementCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSparseMemoryRequirementCount, sizeof(uint32_t));
@@ -17497,7 +17497,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSparseMemoryRequirements;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirements) {
         for (uint32_t i = 0; i < (uint32_t)(*(pSparseMemoryRequirementCount)); ++i) {
@@ -18064,7 +18064,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pQueueFamilyPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pQueueFamilyPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pQueueFamilyPropertyCount, sizeof(uint32_t));
@@ -18073,7 +18073,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pQueueFamilyProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pQueueFamilyProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pQueueFamilyPropertyCount)); ++i) {
@@ -18343,7 +18343,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -18352,7 +18352,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -18730,7 +18730,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -18867,7 +18867,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -19006,7 +19006,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -19145,7 +19145,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -19268,7 +19268,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)local_pData;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pData) {
         memcpy(*streamPtrPtr, (void*)local_pData, sizeof(uint8_t));
@@ -20118,7 +20118,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -21276,7 +21276,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pToolCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pToolCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pToolCount, sizeof(uint32_t));
@@ -21285,7 +21285,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pToolProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pToolProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pToolCount)); ++i) {
@@ -21454,7 +21454,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -21463,7 +21463,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pPrivateDataSlot);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -21573,12 +21573,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_privateDataSlot;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -21686,7 +21686,7 @@
     *streamPtrPtr += sizeof(uint64_t);
     uint64_t cgen_var_1 = (uint64_t)local_privateDataSlot;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (uint64_t*)&local_data, sizeof(uint64_t));
     *streamPtrPtr += sizeof(uint64_t);
@@ -21791,7 +21791,7 @@
     *streamPtrPtr += sizeof(uint64_t);
     uint64_t cgen_var_1 = (uint64_t)local_privateDataSlot;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (uint64_t*)pData, sizeof(uint64_t));
     *streamPtrPtr += sizeof(uint64_t);
@@ -23722,7 +23722,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pBuffers;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBuffers) {
         if (((bindingCount))) {
@@ -23739,7 +23739,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pSizes;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pSizes) {
         memcpy(*streamPtrPtr, (VkDeviceSize*)local_pSizes, ((bindingCount)) * sizeof(VkDeviceSize));
@@ -23748,7 +23748,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pStrides;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pStrides) {
         memcpy(*streamPtrPtr, (VkDeviceSize*)local_pStrides,
@@ -24873,7 +24873,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pSparseMemoryRequirementCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirementCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSparseMemoryRequirementCount, sizeof(uint32_t));
@@ -24882,7 +24882,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSparseMemoryRequirements;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirements) {
         for (uint32_t i = 0; i < (uint32_t)(*(pSparseMemoryRequirementCount)); ++i) {
@@ -25041,7 +25041,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -25382,7 +25382,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSurfaceFormatCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSurfaceFormatCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSurfaceFormatCount, sizeof(uint32_t));
@@ -25391,7 +25391,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pSurfaceFormats;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSurfaceFormats) {
         for (uint32_t i = 0; i < (uint32_t)(*(pSurfaceFormatCount)); ++i) {
@@ -25547,7 +25547,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPresentModeCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPresentModeCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPresentModeCount, sizeof(uint32_t));
@@ -25556,7 +25556,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pPresentModes;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPresentModes) {
         memcpy(*streamPtrPtr, (VkPresentModeKHR*)pPresentModes,
@@ -25713,7 +25713,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -25846,7 +25846,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -25963,7 +25963,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSwapchainImageCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSwapchainImageCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSwapchainImageCount, sizeof(uint32_t));
@@ -25973,7 +25973,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pSwapchainImages;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSwapchainImages) {
         if ((*(pSwapchainImageCount))) {
@@ -26440,7 +26440,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pModes;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pModes) {
         memcpy(*streamPtrPtr, (VkDeviceGroupPresentModeFlagsKHR*)pModes,
@@ -26575,7 +26575,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pRectCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pRectCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pRectCount, sizeof(uint32_t));
@@ -26584,7 +26584,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pRects;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pRects) {
         for (uint32_t i = 0; i < (uint32_t)(*(pRectCount)); ++i) {
@@ -26841,7 +26841,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -26850,7 +26850,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -27001,7 +27001,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -27010,7 +27010,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -27164,7 +27164,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pDisplayCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pDisplayCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pDisplayCount, sizeof(uint32_t));
@@ -27174,7 +27174,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pDisplays;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pDisplays) {
         if ((*(pDisplayCount))) {
@@ -27331,7 +27331,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -27340,7 +27340,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -27519,7 +27519,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -27783,7 +27783,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -27945,7 +27945,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -28100,7 +28100,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -28353,7 +28353,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -28608,7 +28608,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -28859,7 +28859,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -29006,7 +29006,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -29369,7 +29369,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pVideoFormatPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pVideoFormatPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pVideoFormatPropertyCount, sizeof(uint32_t));
@@ -29378,7 +29378,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pVideoFormatProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pVideoFormatProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pVideoFormatPropertyCount)); ++i) {
@@ -29549,7 +29549,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -29558,7 +29558,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pVideoSession);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -29668,12 +29668,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_videoSession;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -29789,12 +29789,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_videoSession;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pMemoryRequirementsCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pMemoryRequirementsCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pMemoryRequirementsCount, sizeof(uint32_t));
@@ -29803,7 +29803,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pMemoryRequirements;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pMemoryRequirements) {
         for (uint32_t i = 0; i < (uint32_t)(*(pMemoryRequirementsCount)); ++i) {
@@ -29966,7 +29966,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_videoSession;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (uint32_t*)&local_bindSessionMemoryInfoCount, sizeof(uint32_t));
     *streamPtrPtr += sizeof(uint32_t);
@@ -30106,7 +30106,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -30115,7 +30115,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pVideoSessionParameters);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -30226,7 +30226,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_videoSessionParameters;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkVideoSessionParametersUpdateInfoKHR(
         stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -30341,12 +30341,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_videoSessionParameters;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -31435,7 +31435,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pQueueFamilyPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pQueueFamilyPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pQueueFamilyPropertyCount, sizeof(uint32_t));
@@ -31444,7 +31444,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pQueueFamilyProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pQueueFamilyProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pQueueFamilyPropertyCount)); ++i) {
@@ -31715,7 +31715,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -31724,7 +31724,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -32278,7 +32278,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPhysicalDeviceGroupCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPhysicalDeviceGroupCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPhysicalDeviceGroupCount, sizeof(uint32_t));
@@ -32287,7 +32287,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPhysicalDeviceGroupProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPhysicalDeviceGroupProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPhysicalDeviceGroupCount)); ++i) {
@@ -33719,7 +33719,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pData;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pData) {
         memcpy(*streamPtrPtr, (void*)local_pData, sizeof(uint8_t));
@@ -33863,7 +33863,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -34004,7 +34004,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -34128,7 +34128,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)local_pData;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pData) {
         memcpy(*streamPtrPtr, (void*)local_pData, sizeof(uint8_t));
@@ -34265,7 +34265,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -35376,7 +35376,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pCounterCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCounterCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pCounterCount, sizeof(uint32_t));
@@ -35385,7 +35385,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pCounters;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCounters) {
         for (uint32_t i = 0; i < (uint32_t)(*(pCounterCount)); ++i) {
@@ -35397,7 +35397,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pCounterDescriptions;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCounterDescriptions) {
         for (uint32_t i = 0; i < (uint32_t)(*(pCounterCount)); ++i) {
@@ -36020,7 +36020,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pSurfaceFormatCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSurfaceFormatCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSurfaceFormatCount, sizeof(uint32_t));
@@ -36029,7 +36029,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSurfaceFormats;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSurfaceFormats) {
         for (uint32_t i = 0; i < (uint32_t)(*(pSurfaceFormatCount)); ++i) {
@@ -36184,7 +36184,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -36193,7 +36193,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -36344,7 +36344,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -36353,7 +36353,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -36512,7 +36512,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -36521,7 +36521,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -37048,7 +37048,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pSparseMemoryRequirementCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirementCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSparseMemoryRequirementCount, sizeof(uint32_t));
@@ -37057,7 +37057,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSparseMemoryRequirements;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirements) {
         for (uint32_t i = 0; i < (uint32_t)(*(pSparseMemoryRequirementCount)); ++i) {
@@ -37236,7 +37236,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -37373,7 +37373,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -38412,7 +38412,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pFragmentShadingRateCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pFragmentShadingRateCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pFragmentShadingRateCount, sizeof(uint32_t));
@@ -38421,7 +38421,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pFragmentShadingRates;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pFragmentShadingRates) {
         for (uint32_t i = 0; i < (uint32_t)(*(pFragmentShadingRateCount)); ++i) {
@@ -39105,7 +39105,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -39114,7 +39114,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pDeferredOperation);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -39227,12 +39227,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_operation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -39329,7 +39329,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_operation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -39423,7 +39423,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_operation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -39514,7 +39514,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_operation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -39641,7 +39641,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pExecutableCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pExecutableCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pExecutableCount, sizeof(uint32_t));
@@ -39650,7 +39650,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pExecutableCount)); ++i) {
@@ -39818,7 +39818,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pStatisticCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pStatisticCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pStatisticCount, sizeof(uint32_t));
@@ -39827,7 +39827,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pStatistics;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pStatistics) {
         for (uint32_t i = 0; i < (uint32_t)(*(pStatisticCount)); ++i) {
@@ -40002,7 +40002,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pInternalRepresentationCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pInternalRepresentationCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pInternalRepresentationCount, sizeof(uint32_t));
@@ -40011,7 +40011,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pInternalRepresentations;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pInternalRepresentations) {
         for (uint32_t i = 0; i < (uint32_t)(*(pInternalRepresentationCount)); ++i) {
@@ -40168,7 +40168,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)ppData;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (ppData) {
         memcpy(*streamPtrPtr, (void**)ppData, sizeof(void*));
@@ -41217,7 +41217,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pCheckpointDataCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCheckpointDataCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pCheckpointDataCount, sizeof(uint32_t));
@@ -41226,7 +41226,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pCheckpointData;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCheckpointData) {
         for (uint32_t i = 0; i < (uint32_t)(*(pCheckpointDataCount)); ++i) {
@@ -42289,7 +42289,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pSparseMemoryRequirementCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirementCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pSparseMemoryRequirementCount, sizeof(uint32_t));
@@ -42298,7 +42298,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pSparseMemoryRequirements;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSparseMemoryRequirements) {
         for (uint32_t i = 0; i < (uint32_t)(*(pSparseMemoryRequirementCount)); ++i) {
@@ -42929,7 +42929,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -43065,7 +43065,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -43194,14 +43194,14 @@
     *streamPtrPtr += sizeof(uint64_t);
     uint64_t cgen_var_1 = (uint64_t)local_location;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (int32_t*)&local_messageCode, sizeof(int32_t));
     *streamPtrPtr += sizeof(int32_t);
     {
         uint32_t l = local_pLayerPrefix ? strlen(local_pLayerPrefix) : 0;
         memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
         *streamPtrPtr += sizeof(uint32_t);
         memcpy(*streamPtrPtr, (char*)local_pLayerPrefix, l);
         *streamPtrPtr += l;
@@ -43209,7 +43209,7 @@
     {
         uint32_t l = local_pMessage ? strlen(local_pMessage) : 0;
         memcpy(*streamPtrPtr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*streamPtrPtr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*streamPtrPtr);
         *streamPtrPtr += sizeof(uint32_t);
         memcpy(*streamPtrPtr, (char*)local_pMessage, l);
         *streamPtrPtr += l;
@@ -43834,7 +43834,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pSizes;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pSizes) {
         memcpy(*streamPtrPtr, (VkDeviceSize*)local_pSizes, ((bindingCount)) * sizeof(VkDeviceSize));
@@ -43954,7 +43954,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pCounterBuffers;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pCounterBuffers) {
         if (((counterBufferCount))) {
@@ -43969,7 +43969,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pCounterBufferOffsets;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pCounterBufferOffsets) {
         memcpy(*streamPtrPtr, (VkDeviceSize*)local_pCounterBufferOffsets,
@@ -44089,7 +44089,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pCounterBuffers;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pCounterBuffers) {
         if (((counterBufferCount))) {
@@ -44104,7 +44104,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pCounterBufferOffsets;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pCounterBufferOffsets) {
         memcpy(*streamPtrPtr, (VkDeviceSize*)local_pCounterBufferOffsets,
@@ -44549,7 +44549,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -44558,7 +44558,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pModule);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -44688,7 +44688,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -44697,7 +44697,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pFunction);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -44807,12 +44807,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_module;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -44924,12 +44924,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_function;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -45607,18 +45607,18 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pInfoSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pInfoSize) {
         uint64_t cgen_var_2_0 = (uint64_t)(*pInfoSize);
         memcpy((*streamPtrPtr), &cgen_var_2_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
     }
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pInfo;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pInfo) {
         memcpy(*streamPtrPtr, (void*)pInfo, (*(pInfoSize)) * sizeof(uint8_t));
@@ -45777,7 +45777,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -46185,7 +46185,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -47162,7 +47162,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -47315,7 +47315,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -47662,7 +47662,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPresentationTimingCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPresentationTimingCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPresentationTimingCount, sizeof(uint32_t));
@@ -47671,7 +47671,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pPresentationTimings;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPresentationTimings) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPresentationTimingCount)); ++i) {
@@ -48274,7 +48274,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -48421,7 +48421,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -49325,7 +49325,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -49461,7 +49461,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -50279,7 +50279,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -50413,7 +50413,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -50645,18 +50645,18 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pDataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pDataSize) {
         uint64_t cgen_var_2_0 = (uint64_t)(*pDataSize);
         memcpy((*streamPtrPtr), &cgen_var_2_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
     }
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pData;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pData) {
         memcpy(*streamPtrPtr, (void*)pData, (*(pDataSize)) * sizeof(uint8_t));
@@ -51149,7 +51149,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -51286,7 +51286,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -52116,7 +52116,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -52254,7 +52254,7 @@
     *streamPtrPtr += sizeof(uint32_t);
     uint64_t cgen_var_2 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pData, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
@@ -52374,7 +52374,7 @@
     *streamPtrPtr += sizeof(uint32_t);
     uint64_t cgen_var_2 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pData, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
@@ -52483,7 +52483,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_2 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pData, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
@@ -52829,7 +52829,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pHostPointer;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pHostPointer) {
         memcpy(*streamPtrPtr, (void*)local_pHostPointer, sizeof(uint8_t));
@@ -53063,7 +53063,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pTimeDomainCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pTimeDomainCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pTimeDomainCount, sizeof(uint32_t));
@@ -53072,7 +53072,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pTimeDomains;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pTimeDomains) {
         memcpy(*streamPtrPtr, (VkTimeDomainEXT*)pTimeDomains,
@@ -53867,7 +53867,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pCheckpointMarker;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pCheckpointMarker) {
         memcpy(*streamPtrPtr, (void*)local_pCheckpointMarker, sizeof(uint8_t));
@@ -53974,7 +53974,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pCheckpointDataCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCheckpointDataCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pCheckpointDataCount, sizeof(uint32_t));
@@ -53983,7 +53983,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pCheckpointData;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCheckpointData) {
         for (uint32_t i = 0; i < (uint32_t)(*(pCheckpointDataCount)); ++i) {
@@ -54625,7 +54625,7 @@
         (VkPerformanceConfigurationAcquireInfoINTEL*)(local_pAcquireInfo), streamPtrPtr);
     uint64_t cgen_var_1 = (uint64_t)(*pConfiguration);
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize =
@@ -54720,7 +54720,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_configuration;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize =
@@ -54814,7 +54814,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_configuration;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -55152,7 +55152,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -55299,7 +55299,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -55551,7 +55551,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pToolCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pToolCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pToolCount, sizeof(uint32_t));
@@ -55560,7 +55560,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pToolProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pToolProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pToolCount)); ++i) {
@@ -55720,7 +55720,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPropertyCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertyCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertyCount, sizeof(uint32_t));
@@ -55729,7 +55729,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertyCount)); ++i) {
@@ -55888,7 +55888,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pCombinationCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCombinationCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pCombinationCount, sizeof(uint32_t));
@@ -55897,7 +55897,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pCombinations;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pCombinations) {
         for (uint32_t i = 0; i < (uint32_t)(*(pCombinationCount)); ++i) {
@@ -56074,7 +56074,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPresentModeCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPresentModeCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPresentModeCount, sizeof(uint32_t));
@@ -56083,7 +56083,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPresentModes;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPresentModes) {
         memcpy(*streamPtrPtr, (VkPresentModeKHR*)pPresentModes,
@@ -56416,7 +56416,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pModes;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pModes) {
         memcpy(*streamPtrPtr, (VkDeviceGroupPresentModeFlagsKHR*)pModes,
@@ -56566,7 +56566,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -57366,7 +57366,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pBuffers;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBuffers) {
         if (((bindingCount))) {
@@ -57383,7 +57383,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pSizes;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pSizes) {
         memcpy(*streamPtrPtr, (VkDeviceSize*)local_pSizes, ((bindingCount)) * sizeof(VkDeviceSize));
@@ -57392,7 +57392,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pStrides;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pStrides) {
         memcpy(*streamPtrPtr, (VkDeviceSize*)local_pStrides,
@@ -58580,7 +58580,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -58717,7 +58717,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -59078,7 +59078,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -59087,7 +59087,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pPrivateDataSlot);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -59198,12 +59198,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_privateDataSlot;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -59312,7 +59312,7 @@
     *streamPtrPtr += sizeof(uint64_t);
     uint64_t cgen_var_1 = (uint64_t)local_privateDataSlot;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (uint64_t*)&local_data, sizeof(uint64_t));
     *streamPtrPtr += sizeof(uint64_t);
@@ -59418,7 +59418,7 @@
     *streamPtrPtr += sizeof(uint64_t);
     uint64_t cgen_var_1 = (uint64_t)local_privateDataSlot;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (uint64_t*)pData, sizeof(uint64_t));
     *streamPtrPtr += sizeof(uint64_t);
@@ -59837,7 +59837,7 @@
                                            streamPtrPtr);
     uint64_t cgen_var_1 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pDescriptor, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
@@ -61075,7 +61075,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pFaultInfo;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pFaultInfo) {
         reservedmarshal_VkDeviceFaultInfoEXT(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -61433,7 +61433,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -62305,7 +62305,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -62314,7 +62314,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pCollection);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -62428,7 +62428,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_collection;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkImageConstraintsInfoFUCHSIA(
         stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -62545,7 +62545,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_collection;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkBufferConstraintsInfoFUCHSIA(
         stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -62662,12 +62662,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_collection;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -62768,7 +62768,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_collection;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkBufferCollectionPropertiesFUCHSIA(
         stream, VK_STRUCTURE_TYPE_MAX_ENUM, (VkBufferCollectionPropertiesFUCHSIA*)(pProperties),
@@ -63289,7 +63289,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pPipelineProperties;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPipelineProperties) {
         reservedmarshal_VkBaseOutStructure(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -63861,7 +63861,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -64185,7 +64185,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pAddress;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pAddress) {
         memcpy(*streamPtrPtr, (uint64_t*)pAddress, sizeof(uint64_t));
@@ -64419,7 +64419,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)local_pImageInfoEntryIndices;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pImageInfoEntryIndices) {
         memcpy(*streamPtrPtr, (uint32_t*)local_pImageInfoEntryIndices,
@@ -64429,7 +64429,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_4 = (uint64_t)(uintptr_t)local_pBufferInfoEntryIndices;
     memcpy((*streamPtrPtr), &cgen_var_4, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferInfoEntryIndices) {
         memcpy(*streamPtrPtr, (uint32_t*)local_pBufferInfoEntryIndices,
@@ -64439,7 +64439,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_5 = (uint64_t)(uintptr_t)local_pBufferViewEntryIndices;
     memcpy((*streamPtrPtr), &cgen_var_5, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferViewEntryIndices) {
         memcpy(*streamPtrPtr, (uint32_t*)local_pBufferViewEntryIndices,
@@ -64449,7 +64449,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_6 = (uint64_t)(uintptr_t)local_pImageInfos;
     memcpy((*streamPtrPtr), &cgen_var_6, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pImageInfos) {
         for (uint32_t i = 0; i < (uint32_t)((imageInfoCount)); ++i) {
@@ -64461,7 +64461,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_7 = (uint64_t)(uintptr_t)local_pBufferInfos;
     memcpy((*streamPtrPtr), &cgen_var_7, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferInfos) {
         for (uint32_t i = 0; i < (uint32_t)((bufferInfoCount)); ++i) {
@@ -64473,7 +64473,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_8 = (uint64_t)(uintptr_t)local_pBufferViews;
     memcpy((*streamPtrPtr), &cgen_var_8, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferViews) {
         if (((bufferViewCount))) {
@@ -64957,7 +64957,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -65114,7 +65114,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -65260,7 +65260,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pAddress;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pAddress) {
         memcpy(*streamPtrPtr, (uint64_t*)pAddress, sizeof(uint64_t));
@@ -65269,7 +65269,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pSize;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pSize) {
         memcpy(*streamPtrPtr, (uint64_t*)pSize, sizeof(uint64_t));
@@ -65278,7 +65278,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_4 = (uint64_t)(uintptr_t)pHostmemId;
     memcpy((*streamPtrPtr), &cgen_var_4, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pHostmemId) {
         memcpy(*streamPtrPtr, (uint64_t*)pHostmemId, sizeof(uint64_t));
@@ -65425,7 +65425,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -66396,7 +66396,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPoolIds;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPoolIds) {
         memcpy(*streamPtrPtr, (uint64_t*)pPoolIds, (*(pPoolIdCount)) * sizeof(uint64_t));
@@ -66522,7 +66522,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pWaitSemaphores;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pWaitSemaphores) {
         if (((waitSemaphoreCount))) {
@@ -66979,7 +66979,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)local_pImageInfoEntryIndices;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pImageInfoEntryIndices) {
         memcpy(*streamPtrPtr, (uint32_t*)local_pImageInfoEntryIndices,
@@ -66989,7 +66989,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_4 = (uint64_t)(uintptr_t)local_pBufferInfoEntryIndices;
     memcpy((*streamPtrPtr), &cgen_var_4, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferInfoEntryIndices) {
         memcpy(*streamPtrPtr, (uint32_t*)local_pBufferInfoEntryIndices,
@@ -66999,7 +66999,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_5 = (uint64_t)(uintptr_t)local_pBufferViewEntryIndices;
     memcpy((*streamPtrPtr), &cgen_var_5, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferViewEntryIndices) {
         memcpy(*streamPtrPtr, (uint32_t*)local_pBufferViewEntryIndices,
@@ -67009,7 +67009,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_6 = (uint64_t)(uintptr_t)local_pImageInfos;
     memcpy((*streamPtrPtr), &cgen_var_6, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pImageInfos) {
         for (uint32_t i = 0; i < (uint32_t)((imageInfoCount)); ++i) {
@@ -67021,7 +67021,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_7 = (uint64_t)(uintptr_t)local_pBufferInfos;
     memcpy((*streamPtrPtr), &cgen_var_7, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferInfos) {
         for (uint32_t i = 0; i < (uint32_t)((bufferInfoCount)); ++i) {
@@ -67033,7 +67033,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_8 = (uint64_t)(uintptr_t)local_pBufferViews;
     memcpy((*streamPtrPtr), &cgen_var_8, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pBufferViews) {
         if (((bufferViewCount))) {
@@ -67048,7 +67048,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_9 = (uint64_t)(uintptr_t)local_pInlineUniformBlockData;
     memcpy((*streamPtrPtr), &cgen_var_9, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pInlineUniformBlockData) {
         memcpy(*streamPtrPtr, (uint8_t*)local_pInlineUniformBlockData,
@@ -67184,7 +67184,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pVertexInfo;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pVertexInfo) {
         for (uint32_t i = 0; i < (uint32_t)((drawCount)); ++i) {
@@ -67331,7 +67331,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pIndexInfo;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pIndexInfo) {
         for (uint32_t i = 0; i < (uint32_t)((drawCount)); ++i) {
@@ -67349,7 +67349,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pVertexOffset;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pVertexOffset) {
         memcpy(*streamPtrPtr, (int32_t*)local_pVertexOffset, sizeof(int32_t));
@@ -67483,7 +67483,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -67492,7 +67492,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pMicromap);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -67602,12 +67602,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_micromap;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -67833,7 +67833,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (uint32_t*)&local_infoCount, sizeof(uint32_t));
     *streamPtrPtr += sizeof(uint32_t);
@@ -67944,7 +67944,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkCopyMicromapInfoEXT(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
                                           (VkCopyMicromapInfoEXT*)(local_pInfo), streamPtrPtr);
@@ -68054,7 +68054,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkCopyMicromapToMemoryInfoEXT(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
                                                   (VkCopyMicromapToMemoryInfoEXT*)(local_pInfo),
@@ -68165,7 +68165,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkCopyMemoryToMicromapInfoEXT(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
                                                   (VkCopyMemoryToMicromapInfoEXT*)(local_pInfo),
@@ -68284,20 +68284,20 @@
     for (uint32_t i = 0; i < (uint32_t)((micromapCount)); ++i) {
         uint64_t cgen_var_0_0 = (uint64_t)local_pMicromaps[i];
         memcpy((*streamPtrPtr), &cgen_var_0_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
     }
     memcpy(*streamPtrPtr, (VkQueryType*)&local_queryType, sizeof(VkQueryType));
     *streamPtrPtr += sizeof(VkQueryType);
     uint64_t cgen_var_1 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pData, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
     uint64_t cgen_var_2 = (uint64_t)local_stride;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -68695,7 +68695,7 @@
     for (uint32_t i = 0; i < (uint32_t)((micromapCount)); ++i) {
         uint64_t cgen_var_0 = (uint64_t)local_pMicromaps[i];
         memcpy((*streamPtrPtr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
     }
     memcpy(*streamPtrPtr, (VkQueryType*)&local_queryType, sizeof(VkQueryType));
@@ -70899,7 +70899,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pColorWriteMasks;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pColorWriteMasks) {
         memcpy(*streamPtrPtr, (VkColorComponentFlags*)local_pColorWriteMasks,
@@ -73029,7 +73029,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)pFormatCount;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pFormatCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pFormatCount, sizeof(uint32_t));
@@ -73038,7 +73038,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pImageFormatProperties;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pImageFormatProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pFormatCount)); ++i) {
@@ -73211,7 +73211,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -73220,7 +73220,7 @@
     }
     uint64_t cgen_var_2 = (uint64_t)(*pSession);
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -73333,12 +73333,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_session;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -73446,7 +73446,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_session;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (VkOpticalFlowSessionBindingPointNV*)&local_bindingPoint,
            sizeof(VkOpticalFlowSessionBindingPointNV));
@@ -73559,7 +73559,7 @@
     }
     uint64_t cgen_var_0 = (uint64_t)local_session;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkOpticalFlowExecuteInfoNV(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
                                                (VkOpticalFlowExecuteInfoNV*)(local_pExecuteInfo),
@@ -73710,7 +73710,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -73720,7 +73720,7 @@
     for (uint32_t i = 0; i < (uint32_t)((createInfoCount)); ++i) {
         uint64_t cgen_var_1_0 = (uint64_t)pShaders[i];
         memcpy((*streamPtrPtr), &cgen_var_1_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
     }
     if (watchdog) {
@@ -73833,12 +73833,12 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_shader;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -73945,23 +73945,23 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_shader;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pDataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pDataSize) {
         uint64_t cgen_var_2_0 = (uint64_t)(*pDataSize);
         memcpy((*streamPtrPtr), &cgen_var_2_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
         *streamPtrPtr += 8;
     }
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pData;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pData) {
         memcpy(*streamPtrPtr, (void*)pData, (*(pDataSize)) * sizeof(uint8_t));
@@ -74092,13 +74092,13 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)local_pShaders;
     memcpy((*streamPtrPtr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pShaders) {
         for (uint32_t i = 0; i < (uint32_t)((stageCount)); ++i) {
             uint64_t cgen_var_0_0 = (uint64_t)local_pShaders[i];
             memcpy((*streamPtrPtr), &cgen_var_0_0, 8);
-            android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+            gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
             *streamPtrPtr += 8;
         }
     }
@@ -74217,7 +74217,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)pPropertiesCount;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pPropertiesCount) {
         memcpy(*streamPtrPtr, (uint32_t*)pPropertiesCount, sizeof(uint32_t));
@@ -74226,7 +74226,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)pProperties;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (pProperties) {
         for (uint32_t i = 0; i < (uint32_t)(*(pPropertiesCount)); ++i) {
@@ -74618,7 +74618,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -74755,7 +74755,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -75142,7 +75142,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (uint32_t*)&local_infoCount, sizeof(uint32_t));
     *streamPtrPtr += sizeof(uint32_t);
@@ -75260,7 +75260,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkCopyAccelerationStructureInfoKHR(
         stream, VK_STRUCTURE_TYPE_MAX_ENUM, (VkCopyAccelerationStructureInfoKHR*)(local_pInfo),
@@ -75373,7 +75373,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkCopyAccelerationStructureToMemoryInfoKHR(
         stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -75487,7 +75487,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     reservedmarshal_VkCopyMemoryToAccelerationStructureInfoKHR(
         stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -75618,13 +75618,13 @@
     *streamPtrPtr += sizeof(VkQueryType);
     uint64_t cgen_var_2 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pData, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
     uint64_t cgen_var_3 = (uint64_t)local_stride;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (watchdog) {
         size_t watchdogBufSize = std::min<size_t>(
@@ -76406,7 +76406,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)local_pMaxPrimitiveCounts;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pMaxPrimitiveCounts) {
         memcpy(*streamPtrPtr, (uint32_t*)local_pMaxPrimitiveCounts,
@@ -76744,7 +76744,7 @@
     *streamPtrPtr += 1 * 8;
     uint64_t cgen_var_1 = (uint64_t)local_deferredOperation;
     memcpy((*streamPtrPtr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     uint64_t cgen_var_2;
     *&cgen_var_2 = get_host_u64_VkPipelineCache((*&local_pipelineCache));
@@ -76760,7 +76760,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)local_pAllocator;
     memcpy((*streamPtrPtr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     if (local_pAllocator) {
         reservedmarshal_VkAllocationCallbacks(stream, VK_STRUCTURE_TYPE_MAX_ENUM,
@@ -76901,7 +76901,7 @@
     *streamPtrPtr += sizeof(uint32_t);
     uint64_t cgen_var_2 = (uint64_t)local_dataSize;
     memcpy((*streamPtrPtr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*streamPtrPtr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*streamPtrPtr));
     *streamPtrPtr += 8;
     memcpy(*streamPtrPtr, (void*)pData, ((dataSize)) * sizeof(uint8_t));
     *streamPtrPtr += ((dataSize)) * sizeof(uint8_t);
diff --git a/guest/vulkan_enc/VkEncoder.cpp.inl b/guest/vulkan_enc/VkEncoder.cpp.inl
index 646e6b0..00f0442 100644
--- a/guest/vulkan_enc/VkEncoder.cpp.inl
+++ b/guest/vulkan_enc/VkEncoder.cpp.inl
@@ -4,7 +4,7 @@
 
 class VkEncoder::Impl {
    public:
-    Impl(IOStream* stream) : m_stream(stream), m_logEncodes(false) {
+    Impl(gfxstream::guest::IOStream* stream) : m_stream(stream), m_logEncodes(false) {
         if (!sResourceTracker) sResourceTracker = ResourceTracker::get();
         m_stream.incStreamRef();
         const char* emuVkLogEncodesPropName = "qemu.vk.log";
@@ -60,7 +60,8 @@
     VkEncoder* mEnc;
 };
 
-VkEncoder::VkEncoder(IOStream* stream, gfxstream::guest::HealthMonitor<>* healthMonitor)
+VkEncoder::VkEncoder(gfxstream::guest::IOStream* stream,
+                     gfxstream::guest::HealthMonitor<>* healthMonitor)
     : mImpl(new VkEncoder::Impl(stream)), mHealthMonitor(healthMonitor) {}
 
 void VkEncoder::flush() { mImpl->flush(); }
diff --git a/guest/vulkan_enc/VkEncoder.h b/guest/vulkan_enc/VkEncoder.h
index 969e588..de06eaa 100644
--- a/guest/vulkan_enc/VkEncoder.h
+++ b/guest/vulkan_enc/VkEncoder.h
@@ -38,17 +38,18 @@
 #include "vulkan_gfxstream.h"
 
 namespace gfxstream {
+namespace guest {
 class IOStream;
-}
+}  // namespace guest
+}  // namespace gfxstream
 
 namespace gfxstream {
 namespace vk {
 
-using gfxstream::guest::HealthMonitor;
-
 class VkEncoder {
    public:
-    VkEncoder(IOStream* stream, HealthMonitor<>* healthMonitor = nullptr);
+    VkEncoder(gfxstream::guest::IOStream* stream,
+              gfxstream::guest::HealthMonitor<>* healthMonitor = nullptr);
     ~VkEncoder();
 
 #include "VkEncoder.h.inl"
@@ -2616,7 +2617,7 @@
    private:
     class Impl;
     std::unique_ptr<Impl> mImpl;
-    HealthMonitor<>* mHealthMonitor;
+    gfxstream::guest::HealthMonitor<>* mHealthMonitor;
 };
 
 }  // namespace vk
diff --git a/guest/vulkan_enc/VulkanStreamGuest.cpp b/guest/vulkan_enc/VulkanStreamGuest.cpp
index 921f0d4..459da45 100644
--- a/guest/vulkan_enc/VulkanStreamGuest.cpp
+++ b/guest/vulkan_enc/VulkanStreamGuest.cpp
@@ -16,7 +16,7 @@
 namespace gfxstream {
 namespace vk {
 
-VulkanStreamGuest::VulkanStreamGuest(IOStream *stream): mStream(stream) {
+VulkanStreamGuest::VulkanStreamGuest(gfxstream::guest::IOStream *stream): mStream(stream) {
     unsetHandleMapping();
     mFeatureBits = ResourceTracker::get()->getStreamFeatures();
 }
diff --git a/guest/vulkan_enc/VulkanStreamGuest.h b/guest/vulkan_enc/VulkanStreamGuest.h
index 89c4e0d..0d84c9e 100644
--- a/guest/vulkan_enc/VulkanStreamGuest.h
+++ b/guest/vulkan_enc/VulkanStreamGuest.h
@@ -32,14 +32,12 @@
 #include <log/log.h>
 #include <inttypes.h>
 
-class IOStream;
-
 namespace gfxstream {
 namespace vk {
 
 class VulkanStreamGuest : public gfxstream::guest::Stream {
 public:
-    VulkanStreamGuest(IOStream* stream);
+    VulkanStreamGuest(gfxstream::guest::IOStream* stream);
     ~VulkanStreamGuest();
 
     // Returns whether the connection is valid.
@@ -80,7 +78,7 @@
 private:
     gfxstream::guest::BumpPool mPool;
     std::vector<uint8_t> mWriteBuffer;
-    IOStream* mStream = nullptr;
+    gfxstream::guest::IOStream* mStream = nullptr;
     DefaultHandleMapping mDefaultHandleMapping;
     VulkanHandleMapping* mCurrentHandleMapping;
     uint32_t mFeatureBits = 0;
diff --git a/guest/vulkan_enc/goldfish_vk_deepcopy_guest.h b/guest/vulkan_enc/goldfish_vk_deepcopy_guest.h
index f682618..20bf9c2 100644
--- a/guest/vulkan_enc/goldfish_vk_deepcopy_guest.h
+++ b/guest/vulkan_enc/goldfish_vk_deepcopy_guest.h
@@ -35,8 +35,8 @@
 #include "goldfish_vk_private_defs.h"
 #include "vk_platform_compat.h"
 #include "vulkan_gfxstream.h"
-using android::base::Allocator;
-using android::base::BumpPool;
+using gfxstream::guest::Allocator;
+using gfxstream::guest::BumpPool;
 // Stuff we are not going to use but if included,
 // will cause compile errors. These are Android Vulkan
 // required extensions, but the approach will be to
diff --git a/guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp b/guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
index d06ebd9..0a4eaa6 100644
--- a/guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
+++ b/guest/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
@@ -289,7 +289,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pUserData;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pUserData) {
         memcpy(*ptr, (void*)forMarshaling->pUserData, sizeof(uint8_t));
@@ -297,23 +297,23 @@
     }
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->pfnAllocation;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_2 = (uint64_t)forMarshaling->pfnReallocation;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_3 = (uint64_t)forMarshaling->pfnFree;
     memcpy((*ptr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_4 = (uint64_t)forMarshaling->pfnInternalAllocation;
     memcpy((*ptr), &cgen_var_4, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_5 = (uint64_t)forMarshaling->pfnInternalFree;
     memcpy((*ptr), &cgen_var_5, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -331,14 +331,14 @@
         // WARNING PTR CHECK
         uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pApplicationName;
         memcpy((*ptr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
         if (forMarshaling->pApplicationName) {
             {
                 uint32_t l =
                     forMarshaling->pApplicationName ? strlen(forMarshaling->pApplicationName) : 0;
                 memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-                android::base::Stream::toBe32((uint8_t*)*ptr);
+                gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
                 *ptr += sizeof(uint32_t);
                 memcpy(*ptr, (char*)forMarshaling->pApplicationName, l);
                 *ptr += l;
@@ -349,7 +349,7 @@
             uint32_t l =
                 forMarshaling->pApplicationName ? strlen(forMarshaling->pApplicationName) : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             memcpy(*ptr, (char*)forMarshaling->pApplicationName, l);
             *ptr += l;
@@ -361,13 +361,13 @@
         // WARNING PTR CHECK
         uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pEngineName;
         memcpy((*ptr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
         if (forMarshaling->pEngineName) {
             {
                 uint32_t l = forMarshaling->pEngineName ? strlen(forMarshaling->pEngineName) : 0;
                 memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-                android::base::Stream::toBe32((uint8_t*)*ptr);
+                gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
                 *ptr += sizeof(uint32_t);
                 memcpy(*ptr, (char*)forMarshaling->pEngineName, l);
                 *ptr += l;
@@ -377,7 +377,7 @@
         {
             uint32_t l = forMarshaling->pEngineName ? strlen(forMarshaling->pEngineName) : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             memcpy(*ptr, (char*)forMarshaling->pEngineName, l);
             *ptr += l;
@@ -436,7 +436,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pApplicationInfo;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pApplicationInfo) {
         reservedmarshal_VkApplicationInfo(
@@ -450,14 +450,14 @@
             c = forMarshaling->enabledLayerCount;
         }
         memcpy(*ptr, (uint32_t*)&c, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         for (uint32_t i = 0; i < c; ++i) {
             uint32_t l = forMarshaling->ppEnabledLayerNames
                              ? strlen(forMarshaling->ppEnabledLayerNames[i])
                              : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             if (l) {
                 memcpy(*ptr, (char*)(forMarshaling->ppEnabledLayerNames[i]), l);
@@ -473,14 +473,14 @@
             c = forMarshaling->enabledExtensionCount;
         }
         memcpy(*ptr, (uint32_t*)&c, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         for (uint32_t i = 0; i < c; ++i) {
             uint32_t l = forMarshaling->ppEnabledExtensionNames
                              ? strlen(forMarshaling->ppEnabledExtensionNames[i])
                              : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             if (l) {
                 memcpy(*ptr, (char*)(forMarshaling->ppEnabledExtensionNames[i]), l);
@@ -781,7 +781,7 @@
     *ptr += sizeof(uint32_t);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->minMemoryMapAlignment;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (VkDeviceSize*)&forMarshaling->minTexelBufferOffsetAlignment,
            sizeof(VkDeviceSize));
@@ -1006,14 +1006,14 @@
             c = forMarshaling->enabledLayerCount;
         }
         memcpy(*ptr, (uint32_t*)&c, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         for (uint32_t i = 0; i < c; ++i) {
             uint32_t l = forMarshaling->ppEnabledLayerNames
                              ? strlen(forMarshaling->ppEnabledLayerNames[i])
                              : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             if (l) {
                 memcpy(*ptr, (char*)(forMarshaling->ppEnabledLayerNames[i]), l);
@@ -1029,14 +1029,14 @@
             c = forMarshaling->enabledExtensionCount;
         }
         memcpy(*ptr, (uint32_t*)&c, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         for (uint32_t i = 0; i < c; ++i) {
             uint32_t l = forMarshaling->ppEnabledExtensionNames
                              ? strlen(forMarshaling->ppEnabledExtensionNames[i])
                              : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             if (l) {
                 memcpy(*ptr, (char*)(forMarshaling->ppEnabledExtensionNames[i]), l);
@@ -1047,7 +1047,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pEnabledFeatures;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pEnabledFeatures) {
         reservedmarshal_VkPhysicalDeviceFeatures(
@@ -1461,7 +1461,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pQueueFamilyIndices;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pQueueFamilyIndices) {
         memcpy(*ptr, (const uint32_t*)forMarshaling->pQueueFamilyIndices,
@@ -1529,7 +1529,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pQueueFamilyIndices;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pQueueFamilyIndices) {
         memcpy(*ptr, (const uint32_t*)forMarshaling->pQueueFamilyIndices,
@@ -1613,7 +1613,7 @@
     *ptr += sizeof(VkShaderModuleCreateFlags);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->codeSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const uint32_t*)forMarshaling->pCode,
            (forMarshaling->codeSize / 4) * sizeof(const uint32_t));
@@ -1637,7 +1637,7 @@
     *ptr += sizeof(VkPipelineCacheCreateFlags);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->initialDataSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const void*)forMarshaling->pInitialData,
            forMarshaling->initialDataSize * sizeof(const uint8_t));
@@ -1655,7 +1655,7 @@
     *ptr += sizeof(uint32_t);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->size;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -1673,7 +1673,7 @@
     }
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->dataSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const void*)forMarshaling->pData,
            forMarshaling->dataSize * sizeof(const uint8_t));
@@ -1703,7 +1703,7 @@
     {
         uint32_t l = forMarshaling->pName ? strlen(forMarshaling->pName) : 0;
         memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         memcpy(*ptr, (char*)forMarshaling->pName, l);
         *ptr += l;
@@ -1711,7 +1711,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pSpecializationInfo;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pSpecializationInfo) {
         reservedmarshal_VkSpecializationInfo(
@@ -1884,7 +1884,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pViewports;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pViewports) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->viewportCount; ++i) {
@@ -1897,7 +1897,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pScissors;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pScissors) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->scissorCount; ++i) {
@@ -1967,7 +1967,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pSampleMask;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pSampleMask) {
         memcpy(*ptr, (const VkSampleMask*)forMarshaling->pSampleMask,
@@ -2122,7 +2122,7 @@
                  : (!((*(forMarshaling->pRasterizationState)).rasterizerDiscardEnable)));
         uint32_t cgen_var_0 = (uint32_t)hasRasterization;
         memcpy((*ptr), &cgen_var_0, 4);
-        android::base::Stream::toBe32((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe32((uint8_t*)(*ptr));
         *ptr += 4;
     }
     uint32_t hasTessellation = 1;
@@ -2135,7 +2135,7 @@
                      });
         uint32_t cgen_var_0 = (uint32_t)hasTessellation;
         memcpy((*ptr), &cgen_var_0, 4);
-        android::base::Stream::toBe32((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe32((uint8_t*)(*ptr));
         *ptr += 4;
     }
     memcpy(*ptr, (VkStructureType*)&forMarshaling->sType, sizeof(VkStructureType));
@@ -2157,7 +2157,7 @@
     if (vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) {
         uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pVertexInputState;
         memcpy((*ptr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
     }
     if ((!(vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) ||
@@ -2170,7 +2170,7 @@
     if (vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) {
         uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pInputAssemblyState;
         memcpy((*ptr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
     }
     if ((!(vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) ||
@@ -2183,7 +2183,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pTessellationState;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pTessellationState) {
         if (hasTessellation) {
@@ -2196,7 +2196,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pViewportState;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pViewportState) {
         if (hasRasterization) {
@@ -2209,7 +2209,7 @@
     if (vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) {
         uint64_t cgen_var_1_0 = (uint64_t)(uintptr_t)forMarshaling->pRasterizationState;
         memcpy((*ptr), &cgen_var_1_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
     }
     if ((!(vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) ||
@@ -2222,7 +2222,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pMultisampleState;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pMultisampleState) {
         if (hasRasterization) {
@@ -2235,7 +2235,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)forMarshaling->pDepthStencilState;
     memcpy((*ptr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDepthStencilState) {
         if (hasRasterization) {
@@ -2248,7 +2248,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_4 = (uint64_t)(uintptr_t)forMarshaling->pColorBlendState;
     memcpy((*ptr), &cgen_var_4, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pColorBlendState) {
         if (hasRasterization) {
@@ -2260,7 +2260,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_5 = (uint64_t)(uintptr_t)forMarshaling->pDynamicState;
     memcpy((*ptr), &cgen_var_5, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDynamicState) {
         reservedmarshal_VkPipelineDynamicStateCreateInfo(
@@ -2522,7 +2522,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pImmutableSamplers;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pImmutableSamplers) {
         if (forMarshaling->descriptorCount) {
@@ -2587,7 +2587,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pImageInfo;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pImageInfo) {
         if ((!(vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) ||
@@ -2606,7 +2606,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pBufferInfo;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pBufferInfo) {
         if ((!(vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) ||
@@ -2624,7 +2624,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)forMarshaling->pTexelBufferView;
     memcpy((*ptr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pTexelBufferView) {
         if ((!(vkStream->getFeatureBits() & VULKAN_STREAM_FEATURE_IGNORED_HANDLES_BIT) ||
@@ -2751,7 +2751,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pResolveAttachments;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pResolveAttachments) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->colorAttachmentCount; ++i) {
@@ -2763,7 +2763,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pDepthStencilAttachment;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDepthStencilAttachment) {
         reservedmarshal_VkAttachmentReference(
@@ -2919,7 +2919,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pInheritanceInfo;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pInheritanceInfo) {
         reservedmarshal_VkCommandBufferInheritanceInfo(
@@ -3090,7 +3090,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pClearValues;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pClearValues) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->clearValueCount; ++i) {
@@ -4004,11 +4004,11 @@
     *ptr += sizeof(VkDescriptorType);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->offset;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->stride;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -4846,7 +4846,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pResolveAttachments;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pResolveAttachments) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->colorAttachmentCount; ++i) {
@@ -4858,7 +4858,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pDepthStencilAttachment;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDepthStencilAttachment) {
         reservedmarshal_VkAttachmentReference2(
@@ -5109,7 +5109,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pBindingFlags;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pBindingFlags) {
         memcpy(*ptr, (const VkDescriptorBindingFlags*)forMarshaling->pBindingFlags,
@@ -5321,7 +5321,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pDepthStencilResolveAttachment;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDepthStencilResolveAttachment) {
         reservedmarshal_VkAttachmentReference2(
@@ -5681,7 +5681,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pWaitSemaphoreValues;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pWaitSemaphoreValues) {
         memcpy(*ptr, (const uint64_t*)forMarshaling->pWaitSemaphoreValues,
@@ -5693,7 +5693,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pSignalSemaphoreValues;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pSignalSemaphoreValues) {
         memcpy(*ptr, (const uint64_t*)forMarshaling->pSignalSemaphoreValues,
@@ -6935,7 +6935,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pDepthAttachment;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDepthAttachment) {
         reservedmarshal_VkRenderingAttachmentInfo(
@@ -6945,7 +6945,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pStencilAttachment;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStencilAttachment) {
         reservedmarshal_VkRenderingAttachmentInfo(
@@ -6972,7 +6972,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pColorAttachmentFormats;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pColorAttachmentFormats) {
         memcpy(*ptr, (const VkFormat*)forMarshaling->pColorAttachmentFormats,
@@ -7363,7 +7363,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pQueueFamilyIndices;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pQueueFamilyIndices) {
         memcpy(*ptr, (const uint32_t*)forMarshaling->pQueueFamilyIndices,
@@ -7426,7 +7426,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pResults;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pResults) {
         memcpy(*ptr, (VkResult*)forMarshaling->pResults,
@@ -7657,7 +7657,7 @@
     {
         uint32_t l = forMarshaling->displayName ? strlen(forMarshaling->displayName) : 0;
         memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         memcpy(*ptr, (char*)forMarshaling->displayName, l);
         *ptr += l;
@@ -7747,7 +7747,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->dpy;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->dpy) {
         memcpy(*ptr, (Display*)forMarshaling->dpy, sizeof(Display));
@@ -7786,7 +7786,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->display;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->display) {
         memcpy(*ptr, (wl_display*)forMarshaling->display, sizeof(wl_display));
@@ -7795,7 +7795,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->surface;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->surface) {
         memcpy(*ptr, (wl_surface*)forMarshaling->surface, sizeof(wl_surface));
@@ -7822,7 +7822,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->window;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->window) {
         memcpy(*ptr, (ANativeWindow*)forMarshaling->window, sizeof(ANativeWindow));
@@ -8046,7 +8046,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pPictureResource;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pPictureResource) {
         reservedmarshal_VkVideoPictureResourceInfoKHR(
@@ -8144,11 +8144,11 @@
     *ptr += sizeof(VkVideoSessionParametersCreateFlagsKHR);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->videoSessionParametersTemplate;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->videoSession;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -8184,11 +8184,11 @@
     *ptr += sizeof(VkVideoBeginCodingFlagsKHR);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->videoSession;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->videoSessionParameters;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (uint32_t*)&forMarshaling->referenceSlotCount, sizeof(uint32_t));
     *ptr += sizeof(uint32_t);
@@ -8383,7 +8383,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pParametersAddInfo;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pParametersAddInfo) {
         reservedmarshal_VkVideoDecodeH264SessionParametersAddInfoKHR(
@@ -8489,7 +8489,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pColorAttachmentSamples;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pColorAttachmentSamples) {
         memcpy(*ptr, (const VkSampleCountFlagBits*)forMarshaling->pColorAttachmentSamples,
@@ -8570,7 +8570,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pAttributes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pAttributes) {
         memcpy(*ptr, (const SECURITY_ATTRIBUTES*)forMarshaling->pAttributes,
@@ -8767,7 +8767,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pAttributes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pAttributes) {
         memcpy(*ptr, (const SECURITY_ATTRIBUTES*)forMarshaling->pAttributes,
@@ -8797,7 +8797,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pWaitSemaphoreValues;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pWaitSemaphoreValues) {
         memcpy(*ptr, (const uint64_t*)forMarshaling->pWaitSemaphoreValues,
@@ -8809,7 +8809,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pSignalSemaphoreValues;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pSignalSemaphoreValues) {
         memcpy(*ptr, (const uint64_t*)forMarshaling->pSignalSemaphoreValues,
@@ -8927,7 +8927,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pRectangles;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pRectangles) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->rectangleCount; ++i) {
@@ -8952,7 +8952,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pRegions;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pRegions) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->swapchainCount; ++i) {
@@ -9032,7 +9032,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pAttributes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pAttributes) {
         memcpy(*ptr, (const SECURITY_ATTRIBUTES*)forMarshaling->pAttributes,
@@ -9576,7 +9576,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pParametersAddInfo;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pParametersAddInfo) {
         reservedmarshal_VkVideoDecodeH265SessionParametersAddInfoKHR(
@@ -9705,7 +9705,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pFragmentShadingRateAttachment;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pFragmentShadingRateAttachment) {
         reservedmarshal_VkAttachmentReference2(
@@ -9998,12 +9998,12 @@
     *ptr += sizeof(VkBool32);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->dataSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pData;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pData) {
         memcpy(*ptr, (void*)forMarshaling->pData, forMarshaling->dataSize * sizeof(uint8_t));
@@ -10102,7 +10102,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pPresentIds;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pPresentIds) {
         memcpy(*ptr, (const uint64_t*)forMarshaling->pPresentIds,
@@ -10157,7 +10157,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pSetupReferenceSlot;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pSetupReferenceSlot) {
         reservedmarshal_VkVideoReferenceSlotInfoKHR(
@@ -10327,7 +10327,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pCheckpointMarker;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pCheckpointMarker) {
         memcpy(*ptr, (void*)forMarshaling->pCheckpointMarker, sizeof(uint8_t));
@@ -10527,7 +10527,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->handle;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->handle) {
         memcpy(*ptr, (const uint32_t*)forMarshaling->handle, sizeof(const uint32_t));
@@ -10591,12 +10591,12 @@
     *ptr += sizeof(VkDebugReportFlagsEXT);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->pfnCallback;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pUserData;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pUserData) {
         memcpy(*ptr, (void*)forMarshaling->pUserData, sizeof(uint8_t));
@@ -10653,7 +10653,7 @@
     {
         uint32_t l = forMarshaling->pObjectName ? strlen(forMarshaling->pObjectName) : 0;
         memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         memcpy(*ptr, (char*)forMarshaling->pObjectName, l);
         *ptr += l;
@@ -10680,7 +10680,7 @@
     *ptr += sizeof(uint64_t);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->tagSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const void*)forMarshaling->pTag, forMarshaling->tagSize * sizeof(const uint8_t));
     *ptr += forMarshaling->tagSize * sizeof(const uint8_t);
@@ -10701,7 +10701,7 @@
     {
         uint32_t l = forMarshaling->pMarkerName ? strlen(forMarshaling->pMarkerName) : 0;
         memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         memcpy(*ptr, (char*)forMarshaling->pMarkerName, l);
         *ptr += l;
@@ -10853,7 +10853,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->dataSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const void*)forMarshaling->pData,
            forMarshaling->dataSize * sizeof(const uint8_t));
@@ -10874,12 +10874,12 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->module;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     {
         uint32_t l = forMarshaling->pName ? strlen(forMarshaling->pName) : 0;
         memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         memcpy(*ptr, (char*)forMarshaling->pName, l);
         *ptr += l;
@@ -10898,7 +10898,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->function;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (uint32_t*)&forMarshaling->gridDimX, sizeof(uint32_t));
     *ptr += sizeof(uint32_t);
@@ -10916,11 +10916,11 @@
     *ptr += sizeof(uint32_t);
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->paramCount;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_2 = (uint64_t)forMarshaling->extraCount;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -11024,7 +11024,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pStdSPSs;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdSPSs) {
         memcpy(*ptr, (const StdVideoH264SequenceParameterSet*)forMarshaling->pStdSPSs,
@@ -11036,7 +11036,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pStdPPSs;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdPPSs) {
         memcpy(*ptr, (const StdVideoH264PictureParameterSet*)forMarshaling->pStdPPSs,
@@ -11063,7 +11063,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pParametersAddInfo;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pParametersAddInfo) {
         reservedmarshal_VkVideoEncodeH264SessionParametersAddInfoEXT(
@@ -11090,7 +11090,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pStdReferenceFinalLists;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdReferenceFinalLists) {
         memcpy(*ptr,
@@ -11117,7 +11117,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pStdReferenceFinalLists;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdReferenceFinalLists) {
         memcpy(*ptr,
@@ -11322,7 +11322,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pStdVPSs;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdVPSs) {
         memcpy(*ptr, (const StdVideoH265VideoParameterSet*)forMarshaling->pStdVPSs,
@@ -11334,7 +11334,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pStdSPSs;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdSPSs) {
         memcpy(*ptr, (const StdVideoH265SequenceParameterSet*)forMarshaling->pStdSPSs,
@@ -11346,7 +11346,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pStdPPSs;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdPPSs) {
         memcpy(*ptr, (const StdVideoH265PictureParameterSet*)forMarshaling->pStdPPSs,
@@ -11375,7 +11375,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pParametersAddInfo;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pParametersAddInfo) {
         reservedmarshal_VkVideoEncodeH265SessionParametersAddInfoEXT(
@@ -11402,7 +11402,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pStdReferenceFinalLists;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdReferenceFinalLists) {
         memcpy(*ptr,
@@ -11429,7 +11429,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pStdReferenceFinalLists;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pStdReferenceFinalLists) {
         memcpy(*ptr,
@@ -11597,11 +11597,11 @@
     *ptr += sizeof(uint32_t);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->ldsUsageSizeInBytes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->scratchMemUsageInBytes;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -11758,7 +11758,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pAttributes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pAttributes) {
         memcpy(*ptr, (const SECURITY_ATTRIBUTES*)forMarshaling->pAttributes,
@@ -11856,7 +11856,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->window;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->window) {
         memcpy(*ptr, (void*)forMarshaling->window, sizeof(uint8_t));
@@ -12060,7 +12060,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pViewportWScalings;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pViewportWScalings) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->viewportCount; ++i) {
@@ -12238,7 +12238,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pTimes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pTimes) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->swapchainCount; ++i) {
@@ -12353,7 +12353,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pDiscardRectangles;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDiscardRectangles) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->discardRectangleCount; ++i) {
@@ -12518,7 +12518,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pView;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pView) {
         memcpy(*ptr, (const void*)forMarshaling->pView, sizeof(const uint8_t));
@@ -12546,7 +12546,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pView;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pView) {
         memcpy(*ptr, (const void*)forMarshaling->pView, sizeof(const uint8_t));
@@ -12574,7 +12574,7 @@
     {
         uint32_t l = forMarshaling->pLabelName ? strlen(forMarshaling->pLabelName) : 0;
         memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         memcpy(*ptr, (char*)forMarshaling->pLabelName, l);
         *ptr += l;
@@ -12602,13 +12602,13 @@
         // WARNING PTR CHECK
         uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pObjectName;
         memcpy((*ptr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
         if (forMarshaling->pObjectName) {
             {
                 uint32_t l = forMarshaling->pObjectName ? strlen(forMarshaling->pObjectName) : 0;
                 memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-                android::base::Stream::toBe32((uint8_t*)*ptr);
+                gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
                 *ptr += sizeof(uint32_t);
                 memcpy(*ptr, (char*)forMarshaling->pObjectName, l);
                 *ptr += l;
@@ -12618,7 +12618,7 @@
         {
             uint32_t l = forMarshaling->pObjectName ? strlen(forMarshaling->pObjectName) : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             memcpy(*ptr, (char*)forMarshaling->pObjectName, l);
             *ptr += l;
@@ -12644,14 +12644,14 @@
         // WARNING PTR CHECK
         uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pMessageIdName;
         memcpy((*ptr), &cgen_var_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
         if (forMarshaling->pMessageIdName) {
             {
                 uint32_t l =
                     forMarshaling->pMessageIdName ? strlen(forMarshaling->pMessageIdName) : 0;
                 memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-                android::base::Stream::toBe32((uint8_t*)*ptr);
+                gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
                 *ptr += sizeof(uint32_t);
                 memcpy(*ptr, (char*)forMarshaling->pMessageIdName, l);
                 *ptr += l;
@@ -12661,7 +12661,7 @@
         {
             uint32_t l = forMarshaling->pMessageIdName ? strlen(forMarshaling->pMessageIdName) : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             memcpy(*ptr, (char*)forMarshaling->pMessageIdName, l);
             *ptr += l;
@@ -12672,7 +12672,7 @@
     {
         uint32_t l = forMarshaling->pMessage ? strlen(forMarshaling->pMessage) : 0;
         memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         memcpy(*ptr, (char*)forMarshaling->pMessage, l);
         *ptr += l;
@@ -12722,12 +12722,12 @@
     *ptr += sizeof(VkDebugUtilsMessageTypeFlagsEXT);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->pfnUserCallback;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pUserData;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pUserData) {
         memcpy(*ptr, (void*)forMarshaling->pUserData, sizeof(uint8_t));
@@ -12755,7 +12755,7 @@
     *ptr += sizeof(uint64_t);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->tagSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const void*)forMarshaling->pTag, forMarshaling->tagSize * sizeof(const uint8_t));
     *ptr += forMarshaling->tagSize * sizeof(const uint8_t);
@@ -13184,7 +13184,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pCoverageModulationTable;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pCoverageModulationTable) {
         memcpy(*ptr, (const float*)forMarshaling->pCoverageModulationTable,
@@ -13263,7 +13263,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pDrmFormatModifierProperties;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDrmFormatModifierProperties) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->drmFormatModifierCount; ++i) {
@@ -13296,7 +13296,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pQueueFamilyIndices;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pQueueFamilyIndices) {
         memcpy(*ptr, (const uint32_t*)forMarshaling->pQueueFamilyIndices,
@@ -13390,7 +13390,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pDrmFormatModifierProperties;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDrmFormatModifierProperties) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->drmFormatModifierCount; ++i) {
@@ -13421,7 +13421,7 @@
     *ptr += sizeof(VkValidationCacheCreateFlagsEXT);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->initialDataSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const void*)forMarshaling->pInitialData,
            forMarshaling->initialDataSize * sizeof(const uint8_t));
@@ -13481,7 +13481,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pShadingRatePalettes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pShadingRatePalettes) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->viewportCount; ++i) {
@@ -13830,7 +13830,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pAccelerationStructures;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pAccelerationStructures) {
         if (forMarshaling->accelerationStructureCount) {
@@ -14035,7 +14035,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pHostPointer;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pHostPointer) {
         memcpy(*ptr, (void*)forMarshaling->pHostPointer, sizeof(uint8_t));
@@ -14388,7 +14388,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pExclusiveScissors;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pExclusiveScissors) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->exclusiveScissorCount; ++i) {
@@ -14446,7 +14446,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pCheckpointMarker;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pCheckpointMarker) {
         memcpy(*ptr, (void*)forMarshaling->pCheckpointMarker, sizeof(uint8_t));
@@ -14509,7 +14509,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pUserData;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pUserData) {
         memcpy(*ptr, (void*)forMarshaling->pUserData, sizeof(uint8_t));
@@ -15465,7 +15465,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pPresentModes;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pPresentModes) {
         memcpy(*ptr, (VkPresentModeKHR*)forMarshaling->pPresentModes,
@@ -15670,7 +15670,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pVertexInputState;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pVertexInputState) {
         reservedmarshal_VkPipelineVertexInputStateCreateInfo(
@@ -15680,7 +15680,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pTessellationState;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pTessellationState) {
         reservedmarshal_VkPipelineTessellationStateCreateInfo(
@@ -15973,7 +15973,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pViewportDepths;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pViewportDepths) {
         reservedmarshal_VkViewport(vkStream, rootType,
@@ -16095,7 +16095,7 @@
     *ptr += sizeof(VkDeviceMemoryReportFlagsEXT);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->pfnUserCallback;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (void*)forMarshaling->pUserData, sizeof(uint8_t));
     *ptr += sizeof(uint8_t);
@@ -16559,80 +16559,80 @@
     *ptr += sizeof(uint32_t);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->bufferCaptureReplayDescriptorDataSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->imageCaptureReplayDescriptorDataSize;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_2 = (uint64_t)forMarshaling->imageViewCaptureReplayDescriptorDataSize;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_3 = (uint64_t)forMarshaling->samplerCaptureReplayDescriptorDataSize;
     memcpy((*ptr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_4 =
         (uint64_t)forMarshaling->accelerationStructureCaptureReplayDescriptorDataSize;
     memcpy((*ptr), &cgen_var_4, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_5 = (uint64_t)forMarshaling->samplerDescriptorSize;
     memcpy((*ptr), &cgen_var_5, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_6 = (uint64_t)forMarshaling->combinedImageSamplerDescriptorSize;
     memcpy((*ptr), &cgen_var_6, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_7 = (uint64_t)forMarshaling->sampledImageDescriptorSize;
     memcpy((*ptr), &cgen_var_7, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_8 = (uint64_t)forMarshaling->storageImageDescriptorSize;
     memcpy((*ptr), &cgen_var_8, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_9 = (uint64_t)forMarshaling->uniformTexelBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_9, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_10 = (uint64_t)forMarshaling->robustUniformTexelBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_10, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_11 = (uint64_t)forMarshaling->storageTexelBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_11, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_12 = (uint64_t)forMarshaling->robustStorageTexelBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_12, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_13 = (uint64_t)forMarshaling->uniformBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_13, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_14 = (uint64_t)forMarshaling->robustUniformBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_14, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_15 = (uint64_t)forMarshaling->storageBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_15, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_16 = (uint64_t)forMarshaling->robustStorageBufferDescriptorSize;
     memcpy((*ptr), &cgen_var_16, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_17 = (uint64_t)forMarshaling->inputAttachmentDescriptorSize;
     memcpy((*ptr), &cgen_var_17, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_18 = (uint64_t)forMarshaling->accelerationStructureDescriptorSize;
     memcpy((*ptr), &cgen_var_18, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (VkDeviceSize*)&forMarshaling->maxSamplerDescriptorBufferRange,
            sizeof(VkDeviceSize));
@@ -16664,7 +16664,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->combinedImageSamplerDensityMapDescriptorSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -17294,7 +17294,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pFixedRateFlags;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pFixedRateFlags) {
         memcpy(*ptr, (VkImageCompressionFixedRateFlagsEXT*)forMarshaling->pFixedRateFlags,
@@ -17474,7 +17474,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pAddressInfos;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pAddressInfos) {
         reservedmarshal_VkDeviceFaultAddressInfoEXT(
@@ -17483,7 +17483,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pVendorInfos;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pVendorInfos) {
         reservedmarshal_VkDeviceFaultVendorInfoEXT(
@@ -17492,7 +17492,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pVendorBinaryData;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pVendorBinaryData) {
         memcpy(*ptr, (void*)forMarshaling->pVendorBinaryData, sizeof(uint8_t));
@@ -17593,7 +17593,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->dfb;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->dfb) {
         memcpy(*ptr, (IDirectFB*)forMarshaling->dfb, sizeof(IDirectFB));
@@ -17602,7 +17602,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->surface;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->surface) {
         memcpy(*ptr, (IDirectFBSurface*)forMarshaling->surface, sizeof(IDirectFBSurface));
@@ -17968,7 +17968,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->collection;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (uint32_t*)&forMarshaling->index, sizeof(uint32_t));
     *ptr += sizeof(uint32_t);
@@ -17987,7 +17987,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->collection;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (uint32_t*)&forMarshaling->index, sizeof(uint32_t));
     *ptr += sizeof(uint32_t);
@@ -18051,7 +18051,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->collection;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (uint32_t*)&forMarshaling->index, sizeof(uint32_t));
     *ptr += sizeof(uint32_t);
@@ -18405,7 +18405,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->context;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->context) {
         memcpy(*ptr, (_screen_context*)forMarshaling->context, sizeof(_screen_context));
@@ -18414,7 +18414,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->window;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->window) {
         memcpy(*ptr, (_screen_window*)forMarshaling->window, sizeof(_screen_window));
@@ -18725,14 +18725,14 @@
     *ptr += sizeof(VkBuildMicromapModeEXT);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->dstMicromap;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (uint32_t*)&forMarshaling->usageCountsCount, sizeof(uint32_t));
     *ptr += sizeof(uint32_t);
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pUsageCounts;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pUsageCounts) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->usageCountsCount; ++i) {
@@ -18844,7 +18844,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->src;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     reservedmarshal_VkDeviceOrHostAddressKHR(vkStream, rootType,
                                              (VkDeviceOrHostAddressKHR*)(&forMarshaling->dst), ptr);
@@ -18867,7 +18867,7 @@
         vkStream, rootType, (VkDeviceOrHostAddressConstKHR*)(&forMarshaling->src), ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->dst;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (VkCopyMicromapModeEXT*)&forMarshaling->mode, sizeof(VkCopyMicromapModeEXT));
     *ptr += sizeof(VkCopyMicromapModeEXT);
@@ -18886,11 +18886,11 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->src;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->dst;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (VkCopyMicromapModeEXT*)&forMarshaling->mode, sizeof(VkCopyMicromapModeEXT));
     *ptr += sizeof(VkCopyMicromapModeEXT);
@@ -18940,7 +18940,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pUsageCounts;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pUsageCounts) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->usageCountsCount; ++i) {
@@ -18951,7 +18951,7 @@
     }
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->micromap;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -19046,7 +19046,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pUsageCounts;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pUsageCounts) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->usageCountsCount; ++i) {
@@ -19057,7 +19057,7 @@
     }
     uint64_t cgen_var_1 = (uint64_t)forMarshaling->micromap;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -19261,7 +19261,7 @@
     reservedmarshal_extension_struct(vkStream, rootType, forMarshaling->pNext, ptr);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->descriptorOffset;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (uint32_t*)&forMarshaling->descriptorSize, sizeof(uint32_t));
     *ptr += sizeof(uint32_t);
@@ -19824,7 +19824,7 @@
     *ptr += sizeof(VkDirectDriverLoadingFlagsLUNARG);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->pfnGetInstanceProcAddr;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
 }
 
@@ -20174,7 +20174,7 @@
     *ptr += sizeof(VkShaderCodeTypeEXT);
     uint64_t cgen_var_0 = (uint64_t)forMarshaling->codeSize;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     memcpy(*ptr, (const void*)forMarshaling->pCode,
            forMarshaling->codeSize * sizeof(const uint8_t));
@@ -20183,13 +20183,13 @@
         // WARNING PTR CHECK
         uint64_t cgen_var_0_0 = (uint64_t)(uintptr_t)forMarshaling->pName;
         memcpy((*ptr), &cgen_var_0_0, 8);
-        android::base::Stream::toBe64((uint8_t*)(*ptr));
+        gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
         *ptr += 8;
         if (forMarshaling->pName) {
             {
                 uint32_t l = forMarshaling->pName ? strlen(forMarshaling->pName) : 0;
                 memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-                android::base::Stream::toBe32((uint8_t*)*ptr);
+                gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
                 *ptr += sizeof(uint32_t);
                 memcpy(*ptr, (char*)forMarshaling->pName, l);
                 *ptr += l;
@@ -20199,7 +20199,7 @@
         {
             uint32_t l = forMarshaling->pName ? strlen(forMarshaling->pName) : 0;
             memcpy(*ptr, (uint32_t*)&l, sizeof(uint32_t));
-            android::base::Stream::toBe32((uint8_t*)*ptr);
+            gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
             *ptr += sizeof(uint32_t);
             memcpy(*ptr, (char*)forMarshaling->pName, l);
             *ptr += l;
@@ -20210,7 +20210,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pSetLayouts;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pSetLayouts) {
         if (forMarshaling->setLayoutCount) {
@@ -20230,7 +20230,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pPushConstantRanges;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pPushConstantRanges) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->pushConstantRangeCount; ++i) {
@@ -20242,7 +20242,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_3 = (uint64_t)(uintptr_t)forMarshaling->pSpecializationInfo;
     memcpy((*ptr), &cgen_var_3, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pSpecializationInfo) {
         reservedmarshal_VkSpecializationInfo(
@@ -20622,7 +20622,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pGeometries;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pGeometries) {
         for (uint32_t i = 0; i < (uint32_t)forMarshaling->geometryCount; ++i) {
@@ -20680,7 +20680,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pAccelerationStructures;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pAccelerationStructures) {
         if (forMarshaling->accelerationStructureCount) {
@@ -20904,7 +20904,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pShaderGroupCaptureReplayHandle;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pShaderGroupCaptureReplayHandle) {
         memcpy(*ptr, (const void*)forMarshaling->pShaderGroupCaptureReplayHandle,
@@ -20962,7 +20962,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_0 = (uint64_t)(uintptr_t)forMarshaling->pLibraryInfo;
     memcpy((*ptr), &cgen_var_0, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pLibraryInfo) {
         reservedmarshal_VkPipelineLibraryCreateInfoKHR(
@@ -20972,7 +20972,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_1 = (uint64_t)(uintptr_t)forMarshaling->pLibraryInterface;
     memcpy((*ptr), &cgen_var_1, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pLibraryInterface) {
         reservedmarshal_VkRayTracingPipelineInterfaceCreateInfoKHR(
@@ -20983,7 +20983,7 @@
     // WARNING PTR CHECK
     uint64_t cgen_var_2 = (uint64_t)(uintptr_t)forMarshaling->pDynamicState;
     memcpy((*ptr), &cgen_var_2, 8);
-    android::base::Stream::toBe64((uint8_t*)(*ptr));
+    gfxstream::guest::Stream::toBe64((uint8_t*)(*ptr));
     *ptr += 8;
     if (forMarshaling->pDynamicState) {
         reservedmarshal_VkPipelineDynamicStateCreateInfo(
@@ -21222,7 +21222,7 @@
         // known or null extension struct
         memcpy(*ptr, &currExtSize, sizeof(uint32_t));
         ;
-        android::base::Stream::toBe32((uint8_t*)*ptr);
+        gfxstream::guest::Stream::toBe32((uint8_t*)*ptr);
         *ptr += sizeof(uint32_t);
         if (!currExtSize) {
             // exit if this was a null extension struct (size == 0 in this branch)
diff --git a/guest/vulkan_enc/meson.build b/guest/vulkan_enc/meson.build
index 800b805..3770923 100644
--- a/guest/vulkan_enc/meson.build
+++ b/guest/vulkan_enc/meson.build
@@ -25,7 +25,7 @@
    'vulkan_enc',
    files_lib_vulkan_enc,
    cpp_args: cpp_args,
-   include_directories: [inc_android_emu, inc_host, inc_android_compat,
+   include_directories: [inc_android_emu, inc_guest_iostream, inc_android_compat,
                          inc_opengl_codec, inc_render_enc, inc_system,
                          inc_goldfish_address_space, inc_platform,
                          inc_vulkan_headers],
diff --git a/scripts/generate-apigen-sources.sh b/scripts/generate-apigen-sources.sh
index 5aeaa17..dd75f10 100755
--- a/scripts/generate-apigen-sources.sh
+++ b/scripts/generate-apigen-sources.sh
@@ -22,4 +22,5 @@
 ./build/gfxstream-generic-apigen -i ./codegen/renderControl -D ./host/renderControl_dec renderControl
 ./build/gfxstream-generic-apigen -i ./codegen/renderControl -E ./guest/renderControl_enc renderControl
 
-./build/gfxstream-generic-apigen -i ./codegen/magma -D ./host/magma/magma_dec magma
\ No newline at end of file
+./build/gfxstream-generic-apigen -i ./codegen/magma -D ./host/magma/magma_dec magma
+./build/gfxstream-generic-apigen -i ./codegen/magma -E ./guest/magma/magma_enc magma
\ No newline at end of file
diff --git a/scripts/generate-vulkan-sources.sh b/scripts/generate-vulkan-sources.sh
index 6b8f53e..5da9b96 100755
--- a/scripts/generate-vulkan-sources.sh
+++ b/scripts/generate-vulkan-sources.sh
@@ -40,7 +40,7 @@
 
 # Generate Vulkan headers
 VULKAN_HEADERS_ROOT=$PROJECT_ROOT/common/vulkan
-mkdir -p $VULKAN_HEADERS_ROOT
+rm -rf $VULKAN_HEADERS_ROOT/include && mkdir -p $VULKAN_HEADERS_ROOT/include
 if [ $? -ne 0 ]; then
     echo "Failed to clear the old Vulkan headers." 1>&2
     exit 1