Spin off some fixes to land right away.

include/core/SkPostConfig.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPostConfig_DEFINED
 #define SkPostConfig_DEFINED
 
@@ skipping 50 matching lines @@
 #endif
 
 #if !defined(SK_ATTRIBUTE)
 #  if defined(__clang__) || defined(__GNUC__)
 #    define SK_ATTRIBUTE(attr) __attribute__((attr))
 #  else
 #    define SK_ATTRIBUTE(attr)
 #  endif
 #endif
 
+// As usual, there are two ways to increase alignment... the MSVC way and the everyone-else way.
+#ifndef SK_STRUCT_ALIGN
+    #ifdef _MSC_VER
+        #define SK_STRUCT_ALIGN(N) __declspec(align(N))
+    #else
+        #define SK_STRUCT_ALIGN(N) __attribute__((aligned(N)))
+    #endif
+#endif
+
 #if !defined(SK_SUPPORT_GPU)
 #  define SK_SUPPORT_GPU 1
 #endif
 
 /**
  * The clang static analyzer likes to know that when the program is not
  * expected to continue (crash, assertion failure, etc). It will notice that
  * some combination of parameters lead to a function call that does not return.
  * It can then make appropriate assumptions about the parameters in code
  * executed only if the non-returning function was *not* called.
@@ skipping 313 matching lines @@
 
 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB)
 #  error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB"
 #elif defined(SK_GAMMA_SRGB)
 #  define SK_GAMMA_EXPONENT (0.0f)
 #elif !defined(SK_GAMMA_EXPONENT)
 #  define SK_GAMMA_EXPONENT (2.2f)
 #endif
 
 #endif // SkPostConfig_DEFINED