Staging: zcache: Squash upstream changes.

https://github.com/LiquidSmooth-Devices/android_kernel_htc_msm8974/commit/13e4bc3bcf0bc24cbd4b7f10f002a149dfb0b11b

Change-Id: I6bb964356d1be63db305df77e8e37034f2002720