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

Change-Id: I94e2a2d98509932928a8f41c2379821a4032d54b