Snap for 12252487 from 1cab34f689f970c02a114016a789eb6814e6641a to simpleperf-release

Change-Id: Ic6c2c0baf554199651acb1382d81721f09daf966