Snap for 6087906 from 659329db951bf01b5e055c26217a0cc669929c00 to simpleperf-release

Change-Id: I013890d5c9c1df70e6946cc7147f5d1c2fffbe1e