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

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1797233

Change-Id: I174578f1a85af8f79640ff08463aba609562f04d