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

Change-Id: I6c3b6601f061ee644a9cbcc3f1bb2b8aefcd103d