Merge "Revert "Add SCRYPT to expected SecretKeyFactories.""