Squash upstream fs updates.
https://github.com/LiquidSmooth-Devices/android_kernel_htc_msm8974/commit/67f555e3c48922b129d8b91a4018e8a2482c12c0

Change-Id: Ie9442975595abdcffda5eb9d243236efd6aed805