Snap for 5590161 from 531f66d59ed0c30a783ea98137abe367e2fc3f20 to simpleperf-release

Change-Id: I0a3f180393c61f9fb0983cce148a728de77aade9