Enabling validation code in serialization and adding serialization to fuzzer

include/core/SkFlattenableSerialization.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFlattenableSerialization_DEFINED
 #define SkFlattenableSerialization_DEFINED
 
-#include "SkTypes.h"
+#include "SkFlattenable.h"
 
 class SkData;
-class SkFlattenable;
 
-SK_API SkData* SkSerializeFlattenable(SkFlattenable*);
-SK_API SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size);
+SK_API SkData* SkValidatingSerializeFlattenable(SkFlattenable*);
+SK_API SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size,
+                                                         SkFlattenable::Type type);
+
+// Temporary fix for canary build
+#define SkSerializeFlattenable(flattenable) \
+SkValidatingSerializeFlattenable(flattenable)
+
+#define SkDeserializeFlattenable(data, size) \
+SkValidatingDeserializeFlattenable(data, size, SkFlattenable::kSkImageFilter_Type)
 
 #endif