Update libmagic to 5.21; remove patches

The patch was finally merged this morning, so it can be removed in the next release. I'll add a comment to that effect.