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