Merge "Reference new location of SDK toolchain"