Merge "thermal: trace_thermal: Fix compilation"