Merge "configure: simplify x86 asm dependencies"