Snap for 7209783 from a328b12fb23d1c883efc96a23be73199741c15f8 to simpleperf-release

Change-Id: I0f57de8fef6ce26b016aba5d858a4febe32e077c