FIDO has a device attestation https://developers.yubico.com/U2F/Attestation_and_Metadata/
But their scheme indeed looks like flawed.
There is a way to make it correct, though. Device manufacturer also has to inject its own root private key into the device. So the device will use additional, third signature on behalf of manufacturer.