[Issue 9453] Move argon2 overlay out of contrib