Merge "java.security.Provider: port to jdk8u60 (second part)"
am: 8445702920

Change-Id: I54c53518876f9480b5ef13c4a730f700867b9057