Fix Amazon VM detection on EC2 Nitro generation.

[dtrejod]

Adds a second check for Amazon to cover Ec2 Gen5 Instances where DMI values have changed.

[googlebot]

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here (e.g. I signed it!) and we'll verify it.

---

What to do if you already signed the CLA

Individual signers

• It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

• Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
• The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
• The email used to register you as an authorized contributor must also be attached to your GitHub account.

[k8s-ci-robot]

Hi @dtrejod. Thanks for your PR.

I'm waiting for a google or kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[dashpole]

This looks reasonable. Do we want to handle cases where one of the files isn't found?

[dtrejod]

Agreed. I updated the original commit.

[dashpole]

/ok-to-test

Ill take another look after you resolve the CLA

[dtrejod]

I signed it!

[googlebot]

CLAs look good, thanks!

[dtrejod]

@dashpole Any blockers to accepting this PR?

[dashpole]

lgtm

[dashpole]

nope, just fell off my radar. Thanks for the contribution and the ping!