trunks: Fixup mis-merges

cl/1081157 was not merged correctly, leading to a build failure in
	   tpm_utility_v2.cc.

cl/1081159 was not merged correctly, leading to tests failing

BUG=b:78571232
TEST=FEATURES=test emerge-fizz attestation

Change-Id: I79495f4403bfcb645c52c8df23dc3ae326362490
2 files changed