Only set x86 ASMFLAGS if building x86 assembly
Remove a redundant makefile ifdef

ASM_ARCH=x86 is only set if USE_ASM is enabled.
Merge pull request #376 from mstorsjo/simplify-x86-asm-makefiles

Simplify makefiles with respect to x86 assembly