Merge "Test the correct return code from call to cryptfs."