Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest...

Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into main am: 80ad54f6 am: 334b8ecc am: 1b4373e0

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



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