Merge changes I0c2e2efb,Id842648e

* changes:
  Workaround for test failures after Bsymbolic fix.
  Revert "Fix build without -Bsymbolic."