Merge "Revert "Revert "Fix the libgcc/libatomic link order."""