Minor tweaks to hypervisor_version to int

Follow up to I28ce23509e3c9feae183a49a8fc5bf3c7c601295. That path had a
few minor issues that weren't worth holding up the patch for. This patch
fixes those issues.

Change-Id: I878cb028e1dc48ad5182820d580fab609ba62db4
Merge "Minor tweaks to hypervisor_version to int"