Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into...

Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2 am: aaefdfe7 am: afa248f3 am: d21b39a7 am: cd02fa76 am: 7fe9a14a am: 97cda45c am: f8100767 am: 76744911

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



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