am 1458007d: Merge "Separate keymaster0 and keymaster1 HALs."

* commit '1458007d0f8623d649e40c671ad0ec51f4913c79':
  Separate keymaster0 and keymaster1 HALs.