Changes to enable Xcode bots for building CBL & Listener