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

Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into rvc-dev am: 7a80b6c9 am: 2405b1a6 am: 723fc22c am: 42e13fa6 am: 99dba6a3 am: b85b6928 am: cafc5670 am: d4d8584a am: ee3afe68

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



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