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

Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into rvc-dev am: 7a80b6c9 am: 2405b1a6

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



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