Merge "simpleperf: improve cpu_hotplug tests." am: 75726c6
am: 9499f0e

* commit '9499f0e9f3d87a59e473bdd55e5582c8402db845':
  simpleperf: improve cpu_hotplug tests.

Change-Id: Ide267393ce6095ec9b1733704af25bb5a0854553