Reland gvr upgrade

chrome/browser/android/vr_shell/vr_math.cc

 // 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.
 
 #include "chrome/browser/android/vr_shell/vr_math.h"
 
 #include <array>
 #include <cmath>
 
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace vr_shell {
 
 // Internal matrix layout:
 //
 //   m[0][0], m[0][1], m[0][2], m[0][3],
 //   m[1][0], m[1][1], m[1][2], m[1][3],
 //   m[2][0], m[2][1], m[2][2], m[2][3],
 //   m[3][0], m[3][1], m[3][2], m[3][3],
 //
@@ skipping 274 matching lines @@
                        const gvr::Vec3f& rayVector,
                        float scale) {
   gvr::Vec3f v;
   v.x = rayOrigin.x + scale * rayVector.x;
   v.y = rayOrigin.y + scale * rayVector.y;
   v.z = rayOrigin.z + scale * rayVector.z;
   return v;
 }
 
 }  // namespace vr_shell