Merge "Fix symlinking script to set up x86/mips properly."