Log Message:
mail/thunderbird: Remediate cbindgen instability

This commit cherry-picks two patches from www/firefox, which are
themselves cherry-picks from upstream mozilla.  The build gets vastly
further, and might even succeed.