Merge "Remove EcIesParameterSpec until it's needed." into mnc-dev