Snap for 7168215 from 0e4f0348282be6d57ad6e654067b0b5a4a8e2332 to simpleperf-release

Change-Id: I8beaaec5573c039ef6a5ec6669f76edadf41cced