Snap for 7221498 from f22bffd4bba699d63ef089bf5d92a109091e85b5 to simpleperf-release

Change-Id: I5ccb02a2f1a6d4addd16a5ad39148fadc76ee1f1