Merge "atrace: Add cpuhp trace points"