Snap for 12284057 from 33bab9581ef800635ae4482824fbe3a3fe370794 to simpleperf-release

Change-Id: Ic7eaf7241f5f0bf5ace13451394586629d0878e3