Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into main am: 74cc2a0784 am: 7556f9fd97 am: 700f19315c am: 6926d6c8a1 am: caabf3fefd

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2752089

Change-Id: Id8ca616fd33d3b398177bbb2b87e82467ecd8770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>