Revert "i686: Fix multiple definitions of __memmove_chk and __memset_chk"

This reverts commit ad92c483.

I had the wrong cherry-pick reference (the commit content is right; it's
just referring to a base that isn't upstream), but let's revert and reapply
for clarity.

Signed-off-by: Sam James <sam@gentoo.org>