Merge "simpleperf: fix ScopedEventTypes."