am 789e3c25: Merge "Fix incorrect keymaster device usage."

* commit '789e3c25742549b4060c66a8074e3b848e4916a5':
  Fix incorrect keymaster device usage.