Snap for 11135399 from 2297fc6345bb51af26c5d116015f61092f1903b9 to simpleperf-release

Change-Id: I6af592554d68cd36b17a595ab21c725178ccd54b