Merge "defconfig: msm8960: enable interactive governor" into msm-3.4