Merge "Change all uses of uint to int in CpuTimePerThreadFreq"