Merge \"MPEG4Writer: Handle writing multiple NAL units in a video sample\" into nyc-mr1-dev
am: af0c7dfd57

Change-Id: I560d5f23bb9385194f506264bd08666bead463da