Merge "make_key: add EC key generation support"