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

Change-Id: I75eed09e3de8c1fd090a8bb4cb9fa861f51dd455