diff --git a/AUTHORS b/AUTHORS
index 12d727654fb..82e4d870289 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -133,3 +133,4 @@ Naveen Bobbili <naveenbobbili@motorola.com>
 Vamshikrishna Yellenki <vamshi@motorola.com>
 Robert Nagy <robert@openbsd.org>
 Nayan Kumar K <qtc746@motorola.com>
+ShankarGanesh K <blr.bmlab@gmail.com>
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 233053b76a4..13519e7e8ed 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -987,9 +987,20 @@
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
+            '../third_party/skia/src/opts/opts_check_arm.cpp',
           ],
         }],
+        [ 'armv7 == 1 and arm_neon == 0', {
+          'sources': [
+            '../third_party/skia/src/opts/memset.arm.S',
+        ],
+        }],
+        [ 'armv7 == 1 and arm_neon == 1', {
+          'sources': [
+            '../third_party/skia/src/opts/memset16_neon.S',
+            '../third_party/skia/src/opts/memset32_neon.S',
+        ],
+        }],
       ],
     },
     {