Merge "Fix FirmwareBootHeaderVerification x86_64 support." into android11-tests-dev am: 24678c98c4

Original change: https://android-review.googlesource.com/c/platform/test/vts/+/1927367

Change-Id: Ief6509be94b649fd9ccb1701356c0d8f96b76cb3