Merge "simpleperf: adjust sample freq instead of checking it." am: 6dd50e65b7
am: 3777a2d811

Change-Id: I46a0b2cea0d7ab2d64336e1fdbebfa9111393607