Include SkTypes.h from SkDynamicAnnotations.h

include/core/SkDynamicAnnotations.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkDynamicAnnotations_DEFINED
 #define SkDynamicAnnotations_DEFINED
 
+// Make sure we see anything set via SkUserConfig.h (e.g. SK_DYNAMIC_ANNOTATIONS_ENABLED).
+#include "SkTypes.h"
+
 // This file contains macros used to send out-of-band signals to dynamic instrumentation systems,
 // namely thread sanitizer.  This is a cut-down version of the full dynamic_annotations library with
 // only the features used by Skia.
 
 #if SK_DYNAMIC_ANNOTATIONS_ENABLED
 
 extern "C" {
 // TSAN provides these hooks.
 void AnnotateIgnoreReadsBegin(const char* file, int line);
 void AnnotateIgnoreReadsEnd(const char* file, int line);
@@ skipping 55 matching lines @@
     SkTRacy& operator=(const T& val) {
         SK_ANNOTATE_UNPROTECTED_WRITE(&fVal, val);
         return *this;
     }
 
 private:
     T fVal;
 };
 
 #endif//SkDynamicAnnotations_DEFINED