am 1dbbc532: Merge "Simpleperf: fix a few bugs."

* commit '1dbbc5321bea27417221dc31edf0114bf26a3302':
  Simpleperf: fix a few bugs.