Merge "drivers: thermal: Include qcom folder for ARCH_QCOM" into msm-4.9