Merge "Clean up linker architecture macros."