Snap for 11400057 from 18819961242099b8ef8be700d584d0fac590c0d0 to simpleperf-release

Change-Id: I8197618c806c2ce20d2c6554978d040cd8e7c4b2