Merge "java.security.Provider: port to jdk8u60 (second part)" am: 8445702920 am: 81749ef47f am: fc0ee229bb
am: 374edfe1f7

Change-Id: I213a816da328c9aad0c5d39ad89aa17355419745