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

Change-Id: I51c47f553968b940a2a9f8ec34a38b29a0cac246