Merge "KeyMint vts: Correct the EC curve parameter and some return code"