Merge "tools_common.sh: add directory name to error output"