Snap for 7168215 from 298ab66d41df36a265ce2bb6c9b881fb9e868fe3 to simpleperf-release

Change-Id: Iebf3677cece39fb869dbb4c9445f67795bfdd3ee