Merge "MPEG4Extractor: fix CTS test failure"