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

* commit '4b58214205d3d29dbdfed49964010235ef3f0403':
  Fix x86 dynamic linker build.