Snap for 7168215 from 0f6dcf73b798c60a4ff204cc4b1a98572fec3393 to simpleperf-release

Change-Id: I8c87a6a7f39807f4247ee58c9e18596721895395