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

* commit '4618462aa1dc6cef73a03685fce495e2485a679b':
  Fix ANRs when rotating or exiting benchmark.