Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into main am: 80ad54f63f

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

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