Merge "Make atomic-inline.h usable from ordinary C++ code."