Merge "Have stdatomic.h punt to C++ atomic when possible"