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