Snap for 13221802 from 1aa202bdb36aca1cf208e0cefb6867ae154a6ace to 25Q2-release Change-Id: I5cf3d738d43f23880a29a1d18fb9d35b1b41b880

diff --git a/wayland_protocol_codegen.go b/wayland_protocol_codegen.go
index 402e77e..43f99cf 100644
--- a/wayland_protocol_codegen.go
+++ b/wayland_protocol_codegen.go

@@ -127,7 +127,7 @@
 
 func (t hostToolDependencyTag) AllowDisabledModuleDependencyProxy(
 	ctx android.OtherModuleProviderContext, target android.ModuleProxy) bool {
-	return android.OtherModuleProviderOrDefault(
+	return android.OtherModulePointerProviderOrDefault(
 		ctx, target, android.CommonModuleInfoProvider).ReplacedByPrebuilt
 }
 
@@ -310,7 +310,7 @@
 				if h, ok := android.OtherModuleProvider(ctx, module, android.HostToolProviderInfoProvider); ok {
 					// A HostToolProvider provides the path to a tool, which will be copied
 					// into the sandbox.
-					if !android.OtherModuleProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled {
+					if !android.OtherModulePointerProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled {
 						if ctx.Config().AllowMissingDependencies() {
 							ctx.AddMissingDependencies([]string{tool})
 						} else {