Merge "Add keymaster2 HAL."
am: 0c5612db38

* commit '0c5612db385d359a7caef385fd1815aad2de7a46':
  Add keymaster2 HAL.