Merge "simpleperf: remove cpu option tests."