am 60bbb93d: Merge "Simpleperf: Fix unused parameter"

* commit '60bbb93d988a5f797b316341b9447ca9ef011603':
  Simpleperf: Fix unused parameter