Moved some of the argon2 patches to a patch file