Try again to rename one SkJpegUtility.h to remove ambiguity.

src/codec/SkJpegUtility_codec.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
-#ifndef SkJpegUtility_DEFINED
-#define SkJpegUtility_DEFINED
+#ifndef SkJpegUtility_codec_DEFINED
+#define SkJpegUtility_codec_DEFINED
 
 #include "SkStream.h"
 
 #include <setjmp.h>
 // stdio is needed for jpeglib
 #include <stdio.h>
 
 extern "C" {
     #include "jpeglib.h"
     #include "jerror.h"
@@ skipping 20 matching lines @@
     SkStream* fStream; // unowned
     enum {
         // TODO (msarett): Experiment with different buffer sizes.
         // This size was chosen because it matches SkImageDecoder.
         kBufferSize = 1024
     };
     uint8_t fBuffer[kBufferSize];
 };
 
 #endif