Remove JDK7 features from Resolver shim.