Apply r267563 to the 64-bit linuxolator

The "new ELF branding type" change originated in the lemul branch and
was later committed to HEAD and then reverted, leaving the 64-bit
linuxolator version of the change in the branch.  Revert it now.