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

Change-Id: I9f145b6dd509ff4f4c631bb2fae3c91a2a0e0444