Merge "msm8226: Add thermal-engine support"