Merge "Cherry-pick: Only use <atomic> for C++11 and newer"