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

Merge "[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: 67777c17 -s ours" into main