am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes"

* commit '5aeb085389954a32e1ea2189b7bec8080b0226c5':
  Enforce tag types in KeymasterArgument classes