am 98d9b925: Reorganize system/keymaster.

* commit '98d9b92547a9a7553b99e3e941a4175926f95b62':
  Reorganize system/keymaster.