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