Merge "IMediaDrmService: remove makeCrypto method"