Merge "Support for writing to MPEG2 transport stream files." into gingerbread