Merge "Revert "simpleperf: enforce clockid support in Android Q."" am: c4385c91c4
am: 89609efff8

Change-Id: I2755deebb1fd0b048bb5e3b1061648b8e19cf4f4