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

gyp/codec.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # GYP file for codec project.
@@ skipping 22 matching lines @@
       'sources': [
         '../src/codec/SkCodec.cpp',
         '../src/codec/SkCodec_libbmp.cpp',
         '../src/codec/SkCodec_libgif.cpp',
         '../src/codec/SkCodec_libico.cpp',
         '../src/codec/SkCodec_libpng.cpp',
         '../src/codec/SkCodec_wbmp.cpp',
         '../src/codec/SkGifInterlaceIter.cpp',
         '../src/codec/SkJpegCodec.cpp',
         '../src/codec/SkJpegDecoderMgr.cpp',
-        '../src/codec/SkJpegUtility.cpp',
+        '../src/codec/SkJpegUtility_codec.cpp',
         '../src/codec/SkMaskSwizzler.cpp',
         '../src/codec/SkMasks.cpp',
         '../src/codec/SkSwizzler.cpp',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/codec',
         ],
       },
       'conditions': [
         [ 'skia_android_framework == 1',
           {
             # TODO(djsollen): this is a temporary dependency until we can update
             # the android framework to a more recent version of libpng.
             'dependencies': [
               'libpng.gyp:libpng',
             ],
           }, {  # !skia_android_framework
             'dependencies': [
               'libpng.gyp:libpng_static',
             ],
           }
         ]
       ]
     },
   ],
 }