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