Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2d6 am: aaefdfe73e am: afa248f3bc am: d21b39a7e1 am: cd02fa76f4 am: 7fe9a14a66 am: 77d794ffb3

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

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