Merge "simpleperf: remove cpu option tests." into nougat-mr1-cts-dev