Merge "simpleperf: enforce clockid support in Android Q."