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