Snap for 8346178 from f00f96a9b9995b391e838a247ffe0bff053d6220 to simpleperf-release

Change-Id: Icdb6802b02d5ef3b8ffac17d5d0f441570639e46