Reland gvr upgrade

chrome/browser/android/vr_shell/vr_gl_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_UTIL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_UTIL_H_
 
-#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"
 #include "ui/gl/gl_bindings.h"
 
 namespace vr_shell {
 
 std::array<float, 16> MatrixToGLArray(const gvr::Mat4f& matrix);
 
 gvr::Rectf ModulateRect(const gvr::Rectf& rect, float width, float height);
 
 gvr::Recti CalculatePixelSpaceRect(const gvr::Sizei& texture_size,
                                    const gvr::Rectf& texture_rect);
 
 // Compile a shader.
 GLuint CompileShader(GLenum shader_type,
                      const GLchar* shader_source,
                      std::string& error);
 
 // Compile and link a program.
 GLuint CreateAndLinkProgram(GLuint vertex_shader_handle,
                             GLuint fragment_shader_handle,
                             std::string& error);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_UTIL_H_