Merge "simpleperf: switch to cpu-clock when cpu-cycles is missing on x86."