Merge "Undefine _Atomic before redefining"