Merge "libmediautils: mk -> bp" into oc-dev