board-8064: update msm_thermal settings
msm_thermal: fix merges