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

Change-Id: I711f66f381452b18149276b9c798eb6ad9e35916