Snap for 6577974 from 061d892d99db8594ab858ada1b34ef9935b1c7af to simpleperf-release

Change-Id: I64f96a43bd06bf0c97a6e33947c6d6f2ae7ff962