Merge "Revert "KeyMint HAL: add curve 25519, bump version""