Merge "Identity: Fix breakage caused by recent changes in libsoft_attestation_cert."