Merge "java.security.spec: update classes in java.security.spec"