Merge "simpleperf: improve cpu_hotplug_test."