Merge "Specify KeyMint EC keys by curve not size"