Merge "simpleperf: try re-enabling events after truncated aux record"