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

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