Snap for 5590161 from d44daa2018b42055d7ea7b1f53850cf7e81a6473 to simpleperf-release

Change-Id: I66b6000386858f37f402447539fec1fb1770fe90