Merge "libmpeg2extractor: add dependency on libmedia_helper"