am 9c83f1d8: am 6a09617e: Merge "keymaster: use new version fields in hw_module"

* commit '9c83f1d8075f701ce6c1686cb6d79cc6605f9d4d':
  keymaster: use new version fields in hw_module