am f58b5d0c: Merge "Fix assembler test to use path if it can\'t find tools."

* commit 'f58b5d0c5600fda074a373e95716678923134fd8':
  Fix assembler test to use path if it can't find tools.