Remove all code related to NaCl

tools/skpdiff/skpdiff_main.cpp

Index: tools/skpdiff/skpdiff_main.cpp
diff --git a/tools/skpdiff/skpdiff_main.cpp b/tools/skpdiff/skpdiff_main.cpp
index 92f1307eca1d5a76435787affe1bd6cf588550e8..b5ba31072d8ca26938bd63a1dcf51d0f67fa290b 100644
--- a/tools/skpdiff/skpdiff_main.cpp
+++ b/tools/skpdiff/skpdiff_main.cpp
@@ -10,6 +10,8 @@
 // the execution of an arbitrary set of difference algorithms.
 // See http://skbug.com/2711 ('rename skpdiff')
 
+#include "SkTypes.h"
+
 #if SK_SUPPORT_OPENCL
 
 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr
@@ -259,7 +261,7 @@ int tool_main(int argc, char * argv[]) {
     return 0;
 }
 
-#if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
+#if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char * argv[]) {
     return tool_main(argc, (char**) argv);
 }