diff --git a/README.chromium b/README.chromium
index 0f5144dff..5ab18dcdf 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 63
+Version: 64
 License: BSD
 License File: LICENSE
 
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index 9903c4a87..a936fafb5 100644
--- a/source/cpu_id.cc
+++ b/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__