Merge "Support more channel configurations in MPEG4Extractor"