Merge "Replace the native scrypt in SyntheticPasswordManager by android.security.Scrypt"