Merge "simpleperf: work around a simpleperf bug on Android Q."