Merge "java.security.cert: update classes in java.security.cert (part 2)"
am: 9484bff017

Change-Id: Idb12e10674a34ebfd3cf0236cc8cbde1979e5cb7