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

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

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



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