am f265bdbf: am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests."

* commit 'f265bdbfc70411c08b4aa7d17125cf1b5e9b14e8':
  Use JCA names for block modes, paddings, and digests.