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

* commit '0fdef9c1878bfd73b0536c840f8415802197b0c3':
  Clean up toolbox runner slightly.

Change-Id: I6791da71a150fc11253d3bc2f2d958a2d694e527