Merge "Added support for MPEG2 video in MPEG4Extractor" into mnc-dev