Issue #20022: Eliminate use of deprecated bundlebuilder in OS X builds.