Merge "Revert "Remove GCC atomic workarounds.""