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

src/codec/SkJpegCodec.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 "SkCodec.h"
 #include "SkJpegCodec.h"
 #include "SkJpegDecoderMgr.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkTypes.h"
 
 // stdio is needed for jpeglib
 #include <stdio.h>
 
 extern "C" {
@@ skipping 474 matching lines @@
     // Create the swizzler
     this->initializeSwizzler(dstInfo, NULL, dstInfo.minRowBytes(), options);
     if (NULL == fSwizzler) {
         SkCodecPrintf("Could not create swizzler\n");
         return NULL;
     }
 
     // Return the new scanline decoder
     return SkNEW_ARGS(SkJpegScanlineDecoder, (dstInfo, this));
 }