Snap for 7168215 from c9244b7379d0f11686489b4ca699e84e6f914207 to simpleperf-release

Change-Id: I33f972d52fd23840a2e2cc3f033704b9c069dbf1