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

* commit '6a09617eaa2e47e768b87c341459bf80e008a359':
  keymaster: use new version fields in hw_module