Include SkTypes so that SK_SUPPORT_GPU is meaningful.

src/core/SkMultiPictureDraw.cpp

Index: src/core/SkMultiPictureDraw.cpp
diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp
index 329271a6b77e86d21c14a9b45b927e719c3f9077..fe41243d6b3ab2b111f84d8c33a689dd4828d998 100644
--- a/src/core/SkMultiPictureDraw.cpp
+++ b/src/core/SkMultiPictureDraw.cpp
@@ -5,16 +5,19 @@
  * found in the LICENSE file.
  */
 
-#if SK_SUPPORT_GPU
-#include "GrLayerHoister.h"
-#include "GrRecordReplaceDraw.h"
-#endif
-
+// Need to include something before #if SK_SUPPORT_GPU so that the Android
+// framework build, which gets its defines from SkTypes rather than a makefile,
+// has the definition before checking it.
 #include "SkCanvas.h"
 #include "SkMultiPictureDraw.h"
 #include "SkPicture.h"
 #include "SkTaskGroup.h"
 
+#if SK_SUPPORT_GPU
+#include "GrLayerHoister.h"
+#include "GrRecordReplaceDraw.h"
+#endif
+
 void SkMultiPictureDraw::DrawData::draw() {
     fCanvas->drawPicture(fPicture, &fMatrix, fPaint);
 }