Snap for 6577974 from d2ac860fa64716566fa046827b9364e9422abdeb to simpleperf-release

Change-Id: Ic152bb8797637d4c6090c5dd0a5fdab4a1bdd3aa