Merge "Snap for 12821328 from c695f0f1e8f65dbecd26b8289f1080f693aae3c4 to simpleperf-release" into simpleperf-release