Merge "libmediautils: mk -> bp" into oc-dev
am: 7b0e5146ee

Change-Id: I0da3beee8bf86cb960dcfb9306dc2d5580a91553