Merge "simpleperf: avoid warning for default freq."
am: 6e0851e917

Change-Id: I3d377eb3874287f3f018ca123f579d6e6e691403