Merge "Fix a typo in cryptfs.c"