Merge "Simpleperf: work around unexpected (pid, tid) pair."