Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."

This reverts commit 95f411fbda480f986811e6f8010f0a2fd91fd206.

Reason for revert: This breaks app compatibility
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:883e38b694a6a2a51d34ea145607b62b0bdb316f)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a2118fa4988f1d8135894800de122296e146a157)
Merged-In: I94d7034907d5befc0aabf7bf2b490d1fc86c69af
Change-Id: I94d7034907d5befc0aabf7bf2b490d1fc86c69af
1 file changed