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

Change-Id: Icb0abdcda06a9a7d450bc3f9af1e5dc474f1c7db