Merge "MediaCodec: Pass missing C2Info for MediaCodecLinearBlock."