Merge "Revert "Revert "Adding e4crypt support"""