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

Change-Id: I1e78cf2aaa09819c969ca1be73269d4703b94769