Merge "MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video" into nyc-mr1-dev