[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: dfabe080 am: 49260a30 am: 8aa8b311 am: e356f8b6 -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: Ia0e8defeccc111a8fada2b2efcbd1bf3c74393ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>