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

* commit '47bc0ffaddacc3514d12db1b8b8bb4b10eae13ea':
  Rename keymaster_device_t to keymaster0_device_t.