Merge "Remove obsolete OMA-DRM support"