Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into main