Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"