Merge "simpleperf: remove cpu option tests."
am: 9ec492a979

Change-Id: I9ed4fc32a7ba7030c48d4d5b7d7a905caed01e6d