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