am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."

* commit 'ad48c4c9c194d66dcc96e74e906825ca7b550e24':
  Add EcIesParameterSpec to enable ECIES crypto.