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

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