Merge "Verify Enum against upstream OpenJDK 8u121-b13."