Fix for InitCpuFlags for android.

Review URL: http://webrtc-codereview.appspot.com/277001

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

README.chromium

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

source/cpu_id.cc

@@ -53,8 +53,8 @@ static void InitCpuFlags() {
               (cpu_info[2] & 0x00000200 ? kCpuHasSSSE3 : 0) |
               kCpuInitialized;
 #elif defined(__ANDROID__) && defined(__ARM_NEON__)
-  features = android_getCpuFeatures();
-  cpu_info_ = (features & ANDROID_CPU_ARM_FEATURE_NEON) ? kCpuHasNEON : 0) |
+  uint64_t features = android_getCpuFeatures();
+  cpu_info_ = ((features & ANDROID_CPU_ARM_FEATURE_NEON) ? kCpuHasNEON : 0) |
               kCpuInitialized;
 #elif defined(__ARM_NEON__)
   // gcc -mfpu=neon defines __ARM_NEON__