Linking arm and arm64 gvr static shim library

third_party/gvr-android-sdk/BUILD.gn

Index: third_party/gvr-android-sdk/BUILD.gn
diff --git a/third_party/gvr-android-sdk/BUILD.gn b/third_party/gvr-android-sdk/BUILD.gn
index 76e0e19ae67453be8da8b37b94a46bafc9ff2b76..a31bff93bc2e2429664316932a41181a722d3bc6 100644
--- a/third_party/gvr-android-sdk/BUILD.gn
+++ b/third_party/gvr-android-sdk/BUILD.gn
@@ -4,13 +4,8 @@
 
 import("//build/config/android/rules.gni")
 
-gvr_arch = current_cpu
-if (gvr_arch == "x64") {
-  gvr_arch = "x86_64"
-}
-
 android_aar_prebuilt("gvr_common_java") {
-  aar_path = "src/ndk/lib/common_library.aar"
+  aar_path = "common_library.aar"
   proguard_configs = [ "src/proguard-gvr.txt" ]
   ignore_manifest = true  # Ignored because manifest merging is not supported (http://crbug.com/643967)
   ignore_native_libraries = true
@@ -20,26 +15,6 @@ android_aar_prebuilt("gvr_controller_java") {
   aar_path = "src/libraries/controller/controller.aar"
 }
 
-source_set("libgvr") {
-  if (gvr_arch != "mipsel") {
-    data_deps = [
-      ":libgvr_copy",
-    ]
-    libs = [ "${root_out_dir}/libgvr.so" ]
-  }
-}
-
-if (gvr_arch != "mipsel") {
-  copy("libgvr_copy") {
-    sources = [
-      "src/ndk/lib/android_${gvr_arch}/libgvr.so",
-    ]
-    outputs = [
-      "${root_out_dir}/libgvr.so",
-    ]
-  }
-}
-
 config("libgvr_config") {
   include_dirs = [ "src/ndk/include/" ]
 }