Manual merge from github.com:CyanogenMod/android_kernel_lge_msm8974 into cm-11.0