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