Simplify makefiles with respect to x86 assembly

Remove a redundant makefile ifdef - ASM_ARCH=x86 is only set if USE_ASM is enabled, so USE_ASM doesn't need to be checked there.

Only set x86 ASMFLAGS if building x86 assembly.