Merge "Fix build without -Bsymbolic."