Revert "Reverting crypto patches"

This reverts commit b73e822d.

This is reverted to integrate new file encryption framework support changes
to ensure all fixes are present to use new encryption policies.

Change-Id: I455ec66664064069ac34e6fe410bd28dc3a53d07
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>