Snap for 5590161 from 12cef6ec8d8048d02ff3f74b36d6f87172cb4e5e to simpleperf-release

Change-Id: I41a23bec23a238da63abd7e8916eab539a37b8b8