Snap for 7168215 from 30056a01d220f09418be2a3276a7634a4f386658 to simpleperf-release

Change-Id: I4d4067547425f8047dcbe40f8db1a527b4492d57