[x86] move more x86-specific modules back to target modules.mk