Merge "x86: compile C files based on TARGET_ARCH"