vmu :)

Conflicts:
	shell/android/jni/src/Android.cpp
	shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
	shell/android/src/com/reicast/emulator/emu/JNIdc.java

Conflicts:
	shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java