Merge "cpufreq: interactive: Use del_timer/add_timer_on to rearm timers" into msm-4.9