elfutils: rebase cxx-header-collision.patch, fix for FreeBSD#415087

rhelmot wants to merge 2 commits intoNixOS:stagingNixOS/nixpkgs:stagingfrom

rhelmot:hounds-elfutilsrhelmot/nixpkgs:hounds-elfutilsCopy head branch name to clipboard