Snap for 6317425 from 4e1c58ce593bf0937f4aac51f265e29f6595177f to simpleperf-release

Change-Id: Ia23672a511a14872a3868acae947c15b2a9f596b