Merge "Refactor: make cryptfs.h smaller" am: 98c501d28e am: 645c2f40a0

Change-Id: I5fb7f528186b6a678a02febd9e866ca4ae467dd4