Snap for 7168215 from a3ff81fd84af012ebb04b6be3670da880cc8270e to simpleperf-release

Change-Id: I82f3869f69688afd7479e596a18e179c71783235