Merge "Add class to read per-thread CPU usage from proc filesystem"