am 12fff70f: Merge "Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""" into mnc-dev

* commit '12fff70fbdfe9293072fa5061e148bf136d765ca':
  Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""