Merge "Snap for 7760914 from c00bfdcc9a0f37e9577e3d364ac2d42fa9608d9e to simpleperf-release" into simpleperf-release