Patches on top of Radu's latest.

src/effects/SkColorCubeFilter.cpp

Index: src/effects/SkColorCubeFilter.cpp
diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp
index fac01bc036563c1182f5092264086859e44b9108..5e9dfde2d4711d72364cde54fbf2549ff47ef934 100644
--- a/src/effects/SkColorCubeFilter.cpp
+++ b/src/effects/SkColorCubeFilter.cpp
@@ -131,7 +131,7 @@ void SkColorCubeFilter::filterSpan(const SkPMColor src[], int count, SkPMColor d
 
     SkOpts::color_cube_filter_span(src, count, dst, colorToIndex,
                                    colorToFactors, fCache.cubeDimension(),
-                                   (SkColor*)fCubeData->data());
+                                   (const SkColor*)fCubeData->data());
 }
 
 SkFlattenable* SkColorCubeFilter::CreateProc(SkReadBuffer& buffer) {