Enable VR shell on Android builds

chrome/common/features.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")
@@ skipping 44 matching lines @@
   enable_plugin_installation = is_win || is_mac
 
   enable_service_discovery = enable_mdns || is_mac
 
   # Enables use of the session service, which is enabled by default.
   # Android stores them separately on the Java side.
   enable_session_service = !is_android && !is_ios && !is_chromecast
 
   enable_supervised_users = !is_ios && !is_chromecast
 
-  # Enables vr shell.
-  enable_vr_shell = false
+  # Enables vr shell (enabled on same architectures as webvr).
+  # TODO(amp): Collapse webvr and vr shell build flags into a single vr flag.
+  enable_vr_shell =
+      is_android && (current_cpu == "arm" || current_cpu == "arm64")
 
   # Enables vr shell UI development on local or remote page.
   enable_vr_shell_ui_dev = false
 
   # Enable native notifications via XPC services (mac only).
   enable_xpc_notifications = false
 
   # Indicates if the build is using PGO.
   pgo_build = chrome_pgo_phase > 0
 
@@ skipping 20 matching lines @@
   "enable_print_preview=$enable_print_preview",
   "enable_printing=$_enable_printing",
   "enable_service_discovery=$enable_service_discovery",
   "enable_vr_shell=$enable_vr_shell",
   "enable_webrtc=$enable_webrtc",
   "enable_webvr=$enable_webvr",
   "mac_views_browser=$mac_views_browser",
   "safe_browsing_mode=$safe_browsing_mode",
   "use_vulcanize=$use_vulcanize",
 ]