Merge \"Merge \\"MPEG4Writer: Fix writing multiple NAL units in a video...
Merge \"Merge \\"MPEG4Writer: Fix writing multiple NAL units in a video sample\\" into nyc-mr1-dev am: 817cdc11\" into nyc-mr1-dev-plus-aosp
am: 03628bde
Change-Id: I1e312c3eac976e38cb9a3bccb1cbf468baca32bc