Snap for 12134224 from 2c6576b92c733c01b845e239949fb5b21659698d to simpleperf-release

Change-Id: I858577aae8eb87602cd2a3871efb23b1f88a33c6