Merge "Fix build issue when USE_3DNOW_ASM is not defined"