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

Change-Id: I19460fdda40a859a3fbc6d235c2d72302b8fe757