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

Change-Id: Ie39ceacccfaf0d346e4c91f79bbef22b0de85c2c