Only use arm_neon when armv7==1.

This corresponds to the Chromium understanding; from build/common.gypi:
# Set Neon compilation flags (only meaningful if armv7==1).
'arm_neon%': 1,

Review URL: https://webrtc-codereview.appspot.com/802004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2770 4adac7df-926f-26a2-2b94-8c16560cd09d

src/build/common.gypi

@@ -150,17 +150,13 @@
         ],
         'conditions': [
           ['armv7==1', {
-            'defines': [
+            'defines': ['WEBRTC_ARCH_ARM_V7',],
-              'WEBRTC_ARCH_ARM_V7',
+            'conditions': [
-              'WEBRTC_DETECT_ARM_NEON',
+              ['arm_neon==1', {
-            ],
+                'defines': ['WEBRTC_ARCH_ARM_NEON',],
-          }],
+              }, {
-          ['arm_neon==1', {
+                'defines': ['WEBRTC_DETECT_ARM_NEON',],
-            'defines': [
+              }],
-              'WEBRTC_ARCH_ARM_NEON',
-            ],
-            'defines!': [
-              'WEBRTC_DETECT_ARM_NEON',
             ],
           }],
         ],