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

* commit 'c9421a7ac67b6613acfb1415964947afb4c0fa30':
  make_key: add EC key generation support