Merge "Snap for 5436719 from 744677aaf516e2af60647297db6c0fe2e17cf330 to simpleperf-release" into simpleperf-release