Merge "java.security.PKCS12Attribute: port class from jdk8u60"
am: 6767fd28b1

Change-Id: Ib80d6ae24734def58881a4536b232870fb885015