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

Change-Id: I0e8455d6123af89bb65481c92cc0aaf45ce406ad