am a436d979: am 01062fca: Merge "Separate keymaster0 and keymaster1 HALs."

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