Integrated remove-c11-atomics changes