Revert "BACKPORT: FROMLIST: Update Inline Encryption from v5 to v6 of patch series"

This reverts commit b7b3af96.

This is a preparation change for merging android-5.4.12 into
msm-5.4 branch. The reverted change is committed already via:

c83b5527 Merge fbe changes from upstream 5.4

Change-Id: I5c9aad30ee41c04e2b77372fc309568aab88d324
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>