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

Change-Id: If8c533aa196969adf38dcbf85673cebb39a79024