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

Change-Id: I85d5bacfc08245397cb4f8aa71406bfeed961c19