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

src/codec/SkJpegUtility_codec.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 "SkCodecPriv.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 
 /*
  * Initialize the source manager
  */
 static void sk_init_source(j_decompress_ptr dinfo) {
     skjpeg_source_mgr* src = (skjpeg_source_mgr*) dinfo->src;
     src->next_input_byte = (const JOCTET*) src->fBuffer;
     src->bytes_in_buffer = 0;
 }
 
 /*
  * Fill the input buffer from the stream
  */
 static boolean sk_fill_input_buffer(j_decompress_ptr dinfo) {
     skjpeg_source_mgr* src = (skjpeg_source_mgr*) dinfo->src;
     size_t bytes = src->fStream->read(src->fBuffer, skjpeg_source_mgr::kBufferSize);
-    
+
     // libjpeg is still happy with a less than full read, as long as the result is non-zero
     if (bytes == 0) {
         return false;
     }
 
     src->next_input_byte = (const JOCTET*) src->fBuffer;
     src->bytes_in_buffer = bytes;
     return true;
 }
 
@@ skipping 43 matching lines @@
 /*
  * Call longjmp to continue execution on an error
  */
 void skjpeg_err_exit(j_common_ptr dinfo) {
     // Simply return to Skia client code
     // JpegDecoderMgr will take care of freeing memory
     skjpeg_error_mgr* error = (skjpeg_error_mgr*) dinfo->err;
     (*error->output_message) (dinfo);
     longjmp(error->fJmpBuf, 1);
 }