Merge "Remove unnecessary #includes of <sys/atomics.h>."