Snap for 7168215 from efa9da41553993f96b28a81963336032efd388e4 to simpleperf-release

Change-Id: I3dcd876f83c0e04cddf5604da4de8fffbcf07c7f