Merge "Remove libmediadrm from Mediaplayer2 dependencies"