[OS-BUILD PATCHv2] Fix binutils breakage