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

Change-Id: Ie496930355643d421941cad833cd3a85be70b70d