Fixed bug 1700 - Joysticks not supported in Android
Added missing files for the Android build
Removed old file from the Android build