check target arch is arm for neon code on android

BUG=307
TESTED=untested
R=michaelbai@chromium.org, noahric@chromium.org, yfriedman@chromium.org

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@970 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 968
+Version: 969
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 968
+#define LIBYUV_VERSION 969
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

libyuv.gyp

@@ -14,8 +14,8 @@
     'use_system_libjpeg%': 0,
     'build_neon': 0,
     'conditions': [
-       ['OS == "android" or OS == "ios"', {
-         # TODO(noahric): Also check tool version for armv7
+       ['OS == "ios" or
+        (OS == "android" and target_arch == "arm" and arm_version >= 7)', {
          'build_neon': 1,
        }],
     ],