Merge "Simpleperf: add separate cpu_hotplug_test." am: 8460573b13
am: ef3f6278f2

* commit 'ef3f6278f2505ef3ae0e24f236b7a14f9ba2d472':
  Simpleperf: add separate cpu_hotplug_test.