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

src/codec/SkJpegDecoderMgr.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkJpegDecoderMgr.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 
 /*
  * Print information, warning, and error messages
  */
 static void print_message(const j_common_ptr info, const char caller[]) {
     char buffer[JMSG_LENGTH_MAX];
     info->err->format_message(info, buffer);
     SkCodecPrintf("libjpeg error %d <%s> from %s\n", info->err->msg_code, buffer, caller);
 }
 
@@ skipping 62 matching lines @@
     }
 }
 
 jmp_buf& JpegDecoderMgr::getJmpBuf() {
     return fErrorMgr.fJmpBuf;
 }
 
 jpeg_decompress_struct* JpegDecoderMgr::dinfo() {
     return &fDInfo;
 }