Snap for 6317425 from 015a5444dae8fed21ebbc23878c5c460ab10ee45 to simpleperf-release

Change-Id: Iccc79a4fce712b11a4d841c9070136e1e612a8e2