Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_kernel_sony_msm8974 into once_again