Merge "Snap for 9795718 from e3d4c2c966463f2a6fd9868be67debf7d60e61c5 to simpleperf-release" into simpleperf-release