Merge "Compare-to-upstream fixes for three classes in java.security."