Merge "javax.crypto: update classes in javax.crypto (part 2)"