am 60e658b7: am bf31aab2: Merge "Rename keymaster tag types to clarify that integers are unsigned."

* commit '60e658b7f697f518b7463ad739e44814c5b91993':
  Rename keymaster tag types to clarify that integers are unsigned.