Merge "keymaster: use new version fields in hw_module"