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

* commit 'c424eb7c35884968d18f2b945ad161808e722fdb':
  Clean up toolbox runner slightly.

Change-Id: I165b6f9f80ab5e75f7458686e7d4255d8c39a5d9