Merge "Revert "Reference new location of SDK toolchain""