Merge "ECParameterSpec: move curve selection to non-final"