Merge "NdkMediaCodec: Wrong check in error callback handler"