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

src/codec/SkJpegCodec.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 SkJpegCodec_DEFINED
 #define SkJpegCodec_DEFINED
 
 #include "SkCodec.h"
 #include "SkImageInfo.h"
 #include "SkJpegDecoderMgr.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 #include "SkStream.h"
 
 extern "C" {
     #include "jpeglib.h"
 }
 
 /*
  *
  * This class implements the decoding for jpeg images
  *
@@ skipping 89 matching lines @@
     SkAutoTDelete<JpegDecoderMgr> fDecoderMgr;
     SkAutoTDelete<SkSwizzler>     fSwizzler;
     size_t                        fSrcRowBytes;
 
     friend class SkJpegScanlineDecoder;
 
     typedef SkCodec INHERITED;
 };
 
 #endif