Merge "PM / devfreq: bw_hwmon: Reflow some code" into msm-4.9