Merge "Modular DRM for MediaPlayer/Removing mimes report" into oc-dev