Snap for 7168215 from 401b386756498dceee9593c004721b2a851497a6 to simpleperf-release

Change-Id: If4476b13f62aaa7d76c5230327abc579bbde0859