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

src/codec/SkJpegDecoderMgr.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 SkJpegDecoderMgr_DEFINED
 #define SkJpegDecoderMgr_DEFINED
 
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 #include "SkSwizzler.h"
 #include "SkTemplates.h"
 
 // stdio is needed for jpeglib
 #include <stdio.h>
 
 extern "C" {
     #include "jpeglib.h"
 }
 
@@ skipping 44 matching lines @@
 
 private:
 
     jpeg_decompress_struct fDInfo;
     skjpeg_source_mgr      fSrcMgr;
     skjpeg_error_mgr       fErrorMgr;
     bool                   fInit;
 };
 
 #endif