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

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

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