Merge "Snap for 10957012 from 0089de8ebae6cdd7291802ed20b8d3c6d8d13212 to simpleperf-release" into simpleperf-release