Merge "Add CryptfsScryptHidlizationEquivalenceTest"