Merge branch 'cm-11.0' of github.com:CyanogenMod/android_kernel_htc_msm8960 into Torched
fix up buildscripts