Merge "Update simpleperf_cpu_hotplug_test to really work host-side"