Merge "Revert "Replace the native scrypt in SyntheticPasswordManager by""