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

Change-Id: If8a55d5733a0b7a564df80aeec0383d3eb119006