Snap for 7168215 from 20ed0a6629dce4eb03b33a72def5369228798907 to simpleperf-release

Change-Id: Iea1bb2f9a409485be7981cd8156cc1a176fe09ab