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

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