Merge "Move to SRC_DIR, instead of copy, after downloading toolchain source"