Drop use of GenericsUtils.alignGenericsTypes for improved generics resolving

Conflicts:
	src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java