Merge "arm/dt: msm8974: use batt_thm for battery presence detection"