Merge "MPEG2TSExtractor: support m2ts container" into qt-dev
am: 5448dc222a

Change-Id: I89810a954df5ee166dc8709ab4f80f4451b72364