Merge "Matcher: Revert some needless differences vs. upstream OpenJDK 8u121-b13."