Snap for 10957012 from 6327cfc4901a6dcba8eb91d90536d480bed938a9 to simpleperf-release

Change-Id: I64da23556dd4ba559adad9e049c48a3895fa8037