Merge "simpleperf: temporarily disable handling cpu hotplug in record cmd." am: 3cd1778cdf
am: d497110c46

Change-Id: Ie9b052c1982fd05ba89d2bd4dc8f91996aaa9987