am fb378aec: am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."

* commit 'fb378aecff0b635f72614e5b0f8cca36271051d1':
  Separate keymaster0 and keymaster1 HALs.