[automerger skipped] Merge "Revert "NdkMedia: fix...

[automerger skipped] 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 am: 81d08006 -s ours

am skip reason: Merged-In I76ef2c404f8264843973e1af9be1b23fc1e6c3af with SHA-1 184293b5 is already in history. Merged-In was found from reverted change.

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

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



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