Merge "IMediaDrmService: remove makeDrm method"