Merge "Revert "cpufreq: interactive: build fixes for 4.4"" into msm-4.9