Merge "Update Keystore to use keymaster2 HAL."