[[ Bug 20033 ]] Ensure SkOpts_crc32 file is included in ARM builds

This patch ensures that the SkOpts_crc32 file is included when building
for ARM.

Author: runrevmark

libskia/libskia.gyp

@@ -207,17 +207,10 @@
 					{
 						'sources':
 						[
-							'<@(opts_armv7_arm64_srcs)',
+                            '<@(opts_armv7_arm64_srcs)',
+                            '<@(opts_crc32_srcs)',
 						],
 					},
-					
-					'target_arch in ("arm64", "armv7 arm64")',
-					{
-						'sources':
-						[
-							'<@(opts_crc32_srcs)',
-						],					
-					},
 				],
 			],
 		},