Merge "Snap for 11135399 from e5a22bf9e07a2fed525a6e7bd0fc57d79e85ff3a to simpleperf-release" into simpleperf-release