am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."

* commit '17dde875dda1b96722e6fb07850c268ca716c3d1':
  Separate keymaster0 and keymaster1 HALs.