am 5fd31f68: am 4b582142: Merge "Fix x86 dynamic linker build."

* commit '5fd31f6891a6e0b5db84c4c7992d0a4b08f3dddd':
  Fix x86 dynamic linker build.