Merge "thermal: msm8960_tsens: Add APQ8064 support" into msm-3.0