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

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

Change-Id: Ibd05b0f960cf4756da50eadf092a036dc86da985