Merge "java.security: update java.security.KeyStore to jdk8u60"
am: d53ae2c285

Change-Id: I22c2ac6b7afcd590864a7a27cd68cc13c8b9da7d