Amend CpuMonitor fix.

Merged CpuMonitor changes.

R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42029005

Cr-Commit-Position: refs/heads/master@{#8445}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8445 4adac7df-926f-26a2-2b94-8c16560cd09d
1 file changed