Revert of Move vr features.gni into its own directory.

chrome/browser/android/vr_shell/BUILD.gn

 # Copyright 2016 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/android/rules.gni")
 import("//chrome/common/features.gni")
-import("//device/vr/features/features.gni")
+import("//device/vr/features.gni")
 import("//testing/test.gni")
 
 assert(enable_vr)
 
 if (current_cpu == "arm" || current_cpu == "arm64") {
   static_library("vr_common") {
     defines = []
 
     sources = [
       "android_ui_gesture_target.cc",
@@ skipping 123 matching lines @@
     libs =
         [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
 
     data = [
       "test/data/sample_inline.gltf",
       "test/data/sample_external.gltf",
       "test/data/sample.bin",
     ]
   }
 }