Merge "x86_64: Update Makefiles for x86_64 targets and add symlinks"