Snap for 7168215 from 90bdae991040f815c57c3d9118369a56d0b3a1c5 to simpleperf-release

Change-Id: I246cab84d54c690edde682305d654beb39e7b122