am 42c79333: am 47bc0ffa: am 5054f7ee: Merge "Rename keymaster_device_t to keymaster0_device_t."

* commit '42c793333c7cfdb311e0abbe0dfeb64074c9f34f':
  Rename keymaster_device_t to keymaster0_device_t.