Merge "Fix x86 dynamic linker build."