Merge changes I0dc38288,I48b713cd

* changes:
  libmediautils: mk -> bp
  Clean up mediadrm dependencies