Snap for 7168215 from 466121f669361af4f17a5da9490c1d65834797f6 to simpleperf-release

Change-Id: I96e5f8a57365b26531d6a99b2254748046a6da5c