Merge "MediaCodec: change exception type"