Verify two more sun.security classes.

Add a bunch of change markers in PKCS7 and fix a needless diff from
upstream in JCAUtil.

Test: make
Bug: 62015290
Change-Id: Ief66a93104b5b33b7205077249c0d71beb3cdaa9
2 files changed