Revert of Update skia to test with libpng to 1.6.10

platform_tools/android/gyp/dependencies.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 # NOTE: We tried adding the gyp file to the android/ directory at the root of
@@ skipping 76 matching lines @@
           '../third_party/externals/expat/lib',  # For expat.h
         ],
       }
     },
     {
       'target_name': 'png',
       'type': 'static_library',
       'sources': [
         '../third_party/externals/png/png.c',
         '../third_party/externals/png/pngerror.c',
+        '../third_party/externals/png/pnggccrd.c',
         '../third_party/externals/png/pngget.c',
         '../third_party/externals/png/pngmem.c',
         '../third_party/externals/png/pngpread.c',
         '../third_party/externals/png/pngread.c',
         '../third_party/externals/png/pngrio.c',
         '../third_party/externals/png/pngrtran.c',
         '../third_party/externals/png/pngrutil.c',
         '../third_party/externals/png/pngset.c',
         '../third_party/externals/png/pngtrans.c',
+        '../third_party/externals/png/pngvcrd.c',
         '../third_party/externals/png/pngwio.c',
         '../third_party/externals/png/pngwrite.c',
         '../third_party/externals/png/pngwtran.c',
         '../third_party/externals/png/pngwutil.c',
       ],
-      # TODO (msarett): Enable testing of Arm NEON opts.
-      # Currently we cannot compile because there is a namespace conflict with
-      # skia/third_party/externals/libpng.
-      #'conditions': [
-      #  [ '("arm" in skia_arch_type) and (arm_version >= 7) and \
-      #     (arm_neon == 1 or arm_neon_optional == 1)', {
-      #    'sources': [
-      #      '../third_party/externals/png/arm/arm_init.c',
-      #      '../third_party/externals/png/arm/filter_neon.S',
-      #      '../third_party/externals/png/arm/filter_neon_intrinsics.c',
-      #    ],
-      #    'cflags': [
-      #      '-DPNG_ARM_NEON_OPT=2',
-      #    ],
-      #  }],
-      #],
       'include_dirs': [
         '../third_party/externals/png',
       ],
       'cflags': [
         '-w',
         '-fvisibility=hidden',
       ],
       'link_settings': {
         'libraries': [
           '-lz',
@@ skipping 201 matching lines @@
           '../../../tools/VisualBench/',
         ],
         'sources': [
           '../apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp',
           '../apps/visualbench/src/main/jni/main.cpp',
         ],
       },
     },
   ]
 }