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

Change-Id: Id9c8cc8c15ac1524d52d2d2713c01184efba5b3c