Snap for 5824001 from c42ad573ce528b52862dffa80ae7c20d5f2331a3 to simpleperf-release

Change-Id: I031f743772276fd9ea13516bca34a210c7a9fdd6