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

Change-Id: I7609d893238f43c5a28b49392333cc8249d818eb