Merge "Improve patches to sun.security on top of upstream OpenJDK8u121-b13."