Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into rvc-dev am: 7a80b6c9c9 am: 2405b1a6f4 am: 723fc22c29 am: 42e13fa660

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

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