Linking arm and arm64 gvr static shim library

build/config/features.gni

Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index 738a1b9077ec16c4a86b9d0917a5e7ffafa2229d..9aad8645f7d4ad1a29b8fa498d1412e26e5cc16b 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -81,12 +81,10 @@ declare_args() {
 
   # Enable WebVR support by default on Android
   # Still requires command line flag to access API
-  # TODO(bshe): Remove is_component_build once we can statically link gvr
-  # library. Currently gvr library only has a prebuild so file which causes
-  # linking issue for non component build.
+  # TODO(bshe): Enable for other architecture too. Currently we only support arm
+  # and arm64.
   enable_webvr = is_android && is_component_build &&
-                 (current_cpu == "x86" || current_cpu == "x64" ||
-                  current_cpu == "arm" || current_cpu == "arm64")
+                 (current_cpu == "arm" || current_cpu == "arm64")
 }
 
 # Additional dependent variables -----------------------------------------------