Merge "simpleperf: avoid some warning messages."
am: b6d9195b75

Change-Id: If3da2e96d8692b44086b434146ad9811b4e045ad