am 98e90755: Merge "Separate keymaster0 and keymaster1 HALs."

* commit '98e9075571d41904c86ed7d78aabef32eac6068f':
  Separate keymaster0 and keymaster1 HALs.