Refactor Sk2x<T> + Sk4x<T> into SkNf<N,T> and SkNi<N,T>

gyp/tests.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Common gypi for unit tests.
 {
   'include_dirs': [
     '../src/core',
     '../src/effects',
     '../src/image',
@@ skipping 182 matching lines @@
     '../tests/RegionTest.cpp',
     '../tests/ResourceCacheTest.cpp',
     '../tests/RoundRectTest.cpp',
     '../tests/RuntimeConfigTest.cpp',
     '../tests/SHA1Test.cpp',
     '../tests/ScalarTest.cpp',
     '../tests/SerializationTest.cpp',
     '../tests/ShaderImageFilterTest.cpp',
     '../tests/ShaderOpacityTest.cpp',
     '../tests/SizeTest.cpp',
-    '../tests/Sk2xTest.cpp',
-    '../tests/Sk4xTest.cpp',
+    '../tests/SkNxTest.cpp',
     '../tests/SkBase64Test.cpp',
     '../tests/SkImageTest.cpp',
     '../tests/SkResourceCacheTest.cpp',
     '../tests/SmallAllocatorTest.cpp',
     '../tests/SortTest.cpp',
     '../tests/SrcOverTest.cpp',
     '../tests/StreamTest.cpp',
     '../tests/StringTest.cpp',
     '../tests/StrokeTest.cpp',
     '../tests/StrokerTest.cpp',
@@ skipping 26 matching lines @@
     '../src/utils/debugger/SkObjectParser.h',
     '../src/utils/debugger/SkObjectParser.cpp',
 
     '../tests/PipeTest.cpp',
     '../src/pipe/utils/SamplePipeControllers.cpp',
 
     '../tests/TDStackNesterTest.cpp',
     '../experimental/PdfViewer/src/SkTDStackNester.h',
   ],
 }