Merge "fix bug in CpuTimePerUidFreqPuller to pull the correct file"