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

Change-Id: I176a6a4d2bfc0102d2e7ce1570492fddf459cecc