Fix Android framework build.

src/core/SkPictureRecorder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#if SK_SUPPORT_GPU
-#include "GrPictureUtils.h"
-#endif
-
 #include "SkPictureRecorder.h"
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
 #include "SkRecorder.h"
 #include "SkRecordOpts.h"
 #include "SkTypes.h"
 
+// Must place SK_SUPPORT_GPU after other includes so it is defined in the
+// Android framework build.
+#if SK_SUPPORT_GPU
+#include "GrPictureUtils.h"
+#endif
+
 SkPictureRecorder::SkPictureRecorder() {}
 
 SkPictureRecorder::~SkPictureRecorder() {}
 
 SkCanvas* SkPictureRecorder::beginRecording(SkScalar width, SkScalar height,
                                             SkBBHFactory* bbhFactory /* = NULL */,
                                             uint32_t recordFlags /* = 0 */) {
     fFlags = recordFlags;
     fCullWidth = width;
     fCullHeight = height;
@@ skipping 50 matching lines @@
 
     return pict;
 }
 
 void SkPictureRecorder::partialReplay(SkCanvas* canvas) const {
     if (NULL == canvas) {
         return;
     }
     SkRecordDraw(*fRecord, canvas, NULL/*bbh*/, NULL/*callback*/);
 }