am 8985a409: am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""

* commit '8985a409b75e23dcadd0cb743a344876a95eb5d8':
  Revert "Revert "Fix the libgcc/libatomic link order.""