Merge remote-tracking branch 'origin/upstream/video-rice' into littleguy77/video-rice

Corresponding upstream merge:
https://bitbucket.org/littleguy77/mupen64plus-video-rice/commits/17377aae0a1c1ca90760e9da7521cc9b15569575

Conflicts:
	jni/gles2rice/src/DeviceBuilder.cpp
	jni/gles2rice/src/OGLExtRender.cpp
	jni/gles2rice/src/OGLRender.cpp
	jni/gles2rice/src/RenderBase.h