am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"

* commit '7e0d5c29b33f3056aedcb44cb8cbae808c11c35d':
  make_key: add EC key generation support