Merge "Deal with ojluni files that include changes beyond OpenJDK 8u121-b13."