am 65e97d17: am 4618462a: Merge "Fix ANRs when rotating or exiting benchmark."

* commit '65e97d17bea36bb3ee8b4ee385a6c199e4bd7369':
  Fix ANRs when rotating or exiting benchmark.