Named some constants.
Add support for MusyX ucode detection.
Private mp3 related variables should be static.
bugfix: Fix crash when CoreVideo_SetCaption(.) is called.

Just remove the body of CoreInterfaceNative.setActivityTitle(.). We
don't need that functionality anyhow.  Keep the function just in case
some SDL versions don't check to see if the function exists before
calling it.
gles2rice: Remove unneeded custom exclusion.

We can revert to upstream because the previous commit makes this block
of code safe.
gles2rice: Consolidated custom code and sync with upstream.

A pull request was placed upstream to move the #if SDL_VIDEO_OPENGL in
OGLGraphicsContext.cpp.

The custom code needs to change with this upstream change, so I commit
both the custom and upstream changesets at once to keep things in sync.
Small fix to GL ES 2.0 codepath (less aggressive #ifdef exclusion).
gles2rice: Merge 'upstream/video-rice' hg:e25d038c196cb7c8cd4dd71839f1994c1257b2ae
rsp-hle: Merge 'upstream/rsp-hle' hg:9bde6881ba0c3b35b6a65d90e577a46861b9994d
front: Add compatibility for SDL 2.0.

No functional changes.

SDL 2.0 uses a slightly different function signature for the imported
Java function createGLContext (config spec is an input).  This just
splits the existing function to allow compatibility with both SDL
versions.
front: Specify maximum screen size in config file.

This allows us to remove some AE customizations on the native side that
are blocking SDL 2.0 compatibility.
gles2rice: Simplify custom video initialization, compatible with SDL 2.

Use config file rather than SDL_GetVideoInfo to get maximum screen
size.  SDL_GetVideoInfo was removed from SDL 2.0, so this also improves
forward compatibility.
cleanup: Remove unused import.
bugfix: Fixed crash when enabling cheats, after clean reinstall.

Bug introduced in commit b0ddd7029fd4d0dbbb6509345e4e9d9f039a0bb9.

Problem was that getHeaderCRC was being called without the required
native libraries loaded. They were being loaded in GameLifecycleHandler
static constructor, but apparently under certain conditions this static
constructor wasn't being called before getHeaderCRC was called.

Moving the library loading to CoreInterfaceNative static constructor
guarantees that the libraries are loaded before a native function is
ever called from Java, since all native functions are consolidated to
that class and the static constructor will be called before any static
methods.
Merge branch 'master' into littleguy77/ae-bridge

Conflicts:
	jni/gles2rice/src/OGLGraphicsContext.cpp
	jni/gles2rice/src/Video.cpp
	src/paulscode/android/mupen64plusae/CoreInterfaceNative.java
	src/paulscode/android/mupen64plusae/GameLifecycleHandler.java