Snap for 8346178 from 4d8755b6936da824309a3a336f06aa127abd68b1 to simpleperf-release

Change-Id: Ic5231fe802113961ba8e7a86c150b78a67c37d34