Merge "Revert "NdkMediaCodec: CTS for surface APIs""