Merge "MPEG4Writer: Fix writing multiple NAL units in a video sample" into nyc-mr1-dev