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