Fix inconsistent generation of MOZ_MACBUNDLE_ID

Please see my branch fix-macos-bundle-id on https://github.com/teor2345/tor-browser.git

This appears to be a Mozilla bug, we should upstream it.