use typeurl funcs for marshalling anypb.Any

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>

core/diff/proxy/differ.go

@@ -24,11 +24,10 @@ import (
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/pkg/epoch"
 	"github.com/containerd/containerd/v2/pkg/oci"
-	"github.com/containerd/containerd/v2/pkg/protobuf"
 	ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
 	"github.com/containerd/errdefs"
+	"github.com/containerd/typeurl/v2"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
-
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
@@ -54,7 +53,7 @@ func (r *diffRemote) Apply(ctx context.Context, desc ocispec.Descriptor, mounts
 
 	payloads := make(map[string]*ptypes.Any)
 	for k, v := range config.ProcessorPayloads {
-		payloads[k] = protobuf.FromAny(v)
+		payloads[k] = typeurl.MarshalProto(v)
 	}
 
 	req := &diffapi.ApplyRequest{

core/diff/stream_unix.go

@@ -28,7 +28,6 @@ import (
 	"os/exec"
 	"sync"
 
-	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/containerd/v2/pkg/protobuf/proto"
 	"github.com/containerd/typeurl/v2"
 )
@@ -41,7 +40,7 @@ func NewBinaryProcessor(ctx context.Context, imt, rmt string, stream StreamProce
 
 	var payloadC io.Closer
 	if payload != nil {
-		pb := protobuf.FromAny(payload)
+		pb := typeurl.MarshalProto(payload)
 		data, err := proto.Marshal(pb)
 		if err != nil {
 			return nil, err

core/diff/stream_windows.go

@@ -29,7 +29,6 @@ import (
 
 	"github.com/Microsoft/go-winio"
 
-	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/containerd/v2/pkg/protobuf/proto"
 	"github.com/containerd/log"
 	"github.com/containerd/typeurl/v2"
@@ -44,7 +43,7 @@ func NewBinaryProcessor(ctx context.Context, imt, rmt string, stream StreamProce
 	cmd.Env = append(cmd.Env, env...)
 
 	if payload != nil {
-		pb := protobuf.FromAny(payload)
+		pb := typeurl.MarshalProto(payload)
 		data, err := proto.Marshal(pb)
 		if err != nil {
 			return nil, err