am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""

* commit '60335c03d7e897267eb20e0b0a6c7c864fd08b43':
  Revert "Revert "Fix the libgcc/libatomic link order.""