Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28 am: 52e04347 am: 724155a3 am: f0efc8fc Change-Id: I04dcfe65ce91145c1cf8c2a13124235916a2d38d