Merge "simpleperf: improve cpu_hotplug_test." am: a903cc9b9c am: 9e71d361ea
am: 97669706ea

Change-Id: If77f4d9aefbbc3b222711de2653c4eb761ac83e3