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

Change-Id: I7ac6e6a17549846b5cc87087e0dd6d7637da5aed