Snap for 7168215 from c5627a18c1a9715654879112328ffffb9ae90725 to simpleperf-release

Change-Id: Ie8b6069fefe0515cb859d12881ca3e6832d3ac47