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

Change-Id: I8ce0ae0f5762da7cc6a2874d501d273105c73e79