Merge "Refactor: make cryptfs.h smaller"