MFC r253102:

Remove redundant definitions to appease tinderbox.

Note: This MFC is required by a future merge of changes to amd64's and
i386's atomic.h.