Patches on top of Radu's latest.

src/opts/SkOpts_neon.cpp

Index: src/opts/SkOpts_neon.cpp
diff --git a/src/opts/SkOpts_neon.cpp b/src/opts/SkOpts_neon.cpp
index 789a97723873c18ef39cd86e0df7a92f84c4febd..aa184d8ef437a12baae903757818e6662debf55b 100644
--- a/src/opts/SkOpts_neon.cpp
+++ b/src/opts/SkOpts_neon.cpp
@@ -10,6 +10,7 @@
 #define SK_OPTS_NS neon
 #include "SkBlitMask_opts.h"
 #include "SkBlurImageFilter_opts.h"
+#include "SkColorCubeFilter_opts.h"
 #include "SkFloatingPoint_opts.h"
 #include "SkMorphologyImageFilter_opts.h"
 #include "SkTextureCompressor_opts.h"
@@ -36,5 +37,7 @@ namespace SkOpts {
         fill_block_dimensions = neon::fill_block_dimensions;
 
         blit_mask_d32_a8 = neon::blit_mask_d32_a8;
+
+        color_cube_filter_span = neon::color_cube_filter_span;
     }
 }