Merge "Change stdatomic.h check from defined(_USING_LIBCXX) to __has_include(<atomic>)" am: 6b2532e19a am: 52de5d1a70 am: 1eb952e8ea
am: 11622e5f11

Change-Id: I417afdcecb00f2211dcc4feab749269fc1613d07