Merge "Fix build after side-stepping global -Bsymbolic."