start again on Sk4x with portable version and unit tests
work on tests

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN-Trybot,Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot,Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot,Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot
BUG=skia:

Review URL: https://codereview.chromium.org/704923003
diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index fccbd1c..b21d61e 100644
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -189,6 +189,7 @@
     '../tests/ShaderImageFilterTest.cpp',
     '../tests/ShaderOpacityTest.cpp',
     '../tests/SizeTest.cpp',
+    '../tests/Sk4xTest.cpp',
     '../tests/SkBase64Test.cpp',
     '../tests/SkResourceCacheTest.cpp',
     '../tests/SmallAllocatorTest.cpp',