Merge "Fix libmedia_helper dependencies." into oc-dr1-dev