Merge "MPEG2TSExtractor: support m2ts container"