Snap for 11400057 from 396139705abd7cb71cc8f1d7d5df71ace6f46fb9 to simpleperf-release

Change-Id: Ieda96cb928d8ed4aade850b3631c5e7969fd1b63