Merge "Revert "msm: thermal: Clean up msm cpufreq function calls""