Merge "simpleperf: improve cpu_hotplug tests."