Merge "Verify two more sun.security classes."
am: 1221497835

Change-Id: I5b394e223f9f3cbd044bce0926f6184ba008c5cb