nicki: partly revert "encryption fix"
nicki: Fix data fail to unmount when encrypt device
Merge https://github.com/freexperia/android_device_sony_nicki into HEAD