Merge "Clean up toolbox runner slightly."
am: 2d7c1cd

* commit '2d7c1cd96a92d3e7b6064b856c9b3fe279d901fe':
  Clean up toolbox runner slightly.

Change-Id: Ic4f4eef6ee51a81a99fcad87a8d8eabae1b01e42