am 5054f7ee: Merge "Rename keymaster_device_t to keymaster0_device_t."

* commit '5054f7ee4fa6e747eb8d08f60ec91ba6a9363878':
  Rename keymaster_device_t to keymaster0_device_t.