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

* commit '0ea16fcca3383bda04e873032d7721324ec90c42':
  Revert "Revert "Fix the libgcc/libatomic link order.""