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