* commit '58031d5eb5531f8bc45ac1789ea1cc9134591358': Improve the AndroidKeyStore-backed HMAC state machine.