Merge "Fix stack tool to find the correct toolchain"