Merge "Remove libmediadrm symlinks"